postvlja bayes_auto_expire na 0

[spamassassin-cn.git] / debian / postinst

diff --git a/debian/postinst b/debian/postinst
index 06d468f..3b4574f 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -202,18 +202,47 @@ if [ -f $examdir/local.cf ]; then
     # calculate trusted networks
     cp_get_netaddr || true
     netaddr="$RET"
+    # ... get already configured trusted networks
     trusted_networks=$(awk '/^trusted_networks/ { print $2 }' \
-        $confdir/local.cf.$$)
-    for i in "127.0.0.0/8" "$netaddr"; do
+        $confdir/local.cf.$$ | sed -e 's/,/ /g')
+    # ... merge with local networks configured on eth interfaces
+    for i in $netaddr; do
         if ! echo "$trusted_networks" | grep -q "$i"; then
             trusted_networks="$trusted_networks $i"
         fi
     done
+    # ... merge with Postfix ranges
+    if [ -x /usr/sbin/postconf ]; then
+        for i in $(postconf -h mynetworks | sed -e 's/,/ /g'); do
+            if ! echo "$trusted_networks" | grep -q "$i"; then
+                trusted_networks="$trusted_networks $i"
+            fi
+        done
+    fi
+    # ... strip 127/8 range
+    for i in $trusted_networks; do
+        if ! echo "$i" | egrep -q \
+            "127.0.0.0/8|\[::1\]/128|\[::ffff:127.0.0.0\]/104"; then
+            trusted_networks_clean="$trusted_networks_clean $i"
+        fi
+    done
+    # ... strip left and right blanks from final string
+    trusted_networks_clean=$(echo "$trusted_networks_clean" \
+        |  sed 's/^[ \t]*//;s/[ \t]*$//')
+    # ... and replace if non-zero
+    if [ ! -z "$trusted_networks_clean" ]; then
+        trusted_networks=$trusted_networks_clean
+    fi
     cp_check_and_sed "^trusted_networks " \
         "s#^trusted_networks .*#trusted_networks $trusted_networks#g" \
         $confdir/local.cf.$$ || true
     echo "CN: Activated $trusted_networks as trusted networks"
 
+    cp_check_and_sed "^bayes_auto_expire 1" \
+        "s#^bayes_auto_expire .*#bayes_auto_expire 0#g" \
+        $confdir/local.cf.$$ || true
+    echo "CN: Set bayes_auto_expire to 0"
+        
     # different than template
     if ! cmp -s $confdir/local.cf.$$ $confdir/local.cf; then
         # backup if not zero size
@@ -263,6 +292,16 @@ for i in $list; do
         mv -f $i.$$ $i
     fi
     rm -f $i.$$
+
+    # enable AWL
+    cp -f $i $i.$$
+    plugin="loadplugin Mail::SpamAssassin::Plugin::AWL"
+    cp_check_and_sed "^#$plugin.*$" \
+        "s/^#$plugin.*$/$plugin/g" $i.$$ || true
+    if ! cmp -s $i.$$ $i; then
+        mv -f $i.$$ $i
+    fi
+    rm -f $i.$$
 done
 
 # check and replace /etc/default/spamasassin if needed
@@ -333,7 +372,7 @@ if getent passwd amavis >/dev/null 2>&1; then
 fi
 
 # import SA keys
-echo "CN: Importing SpamAssassin and SARE public PGP keys"
+echo "CN: Importing SpamAssassin channels' public PGP keys"
 echo "$(date +'%d-%m-%Y %T'): Importing new SA keys..." >> \
     /var/log/sa-update.log
 if [ ! -d /etc/spamassassin/sa-update-keys ]; then
@@ -348,6 +387,8 @@ sa-update --import /etc/spamassassin/sa-keys.pgp \
 # clean old RulesDuJour rules
 echo "CN: Cleaning old RulesDuJour and SARE rules..."
 rm -rf /etc/spamassassin/*_sare_*.cf /etc/spamassassin/RulesDuJour
+find /var/lib/spamassassin -iname \*_sare_\* -print0| xargs -0r rm -rf
+sed -i -e '/dostech.net/d' /etc/spamassassin/sa-update.channels
 echo "CN: Please use /etc/spamassassin/sa-update.channels in future!"
     
 # get/update the rules
@@ -356,9 +397,10 @@ echo "$(date +'%d-%m-%Y %T'): Fetching new SA rules..." >> \
     /var/log/sa-update.log
 sa-update \
     --channelfile /etc/spamassassin/sa-update.channels \
-    --gpgkey 856AA88A \
+    --allowplugins \
+    --gpgkey 6C6191E3 \
     --gpgkey 24F434CE \
-    --gpgkey BDE9DC10 >>/var/log/sa-update.log 2>&1 || true
+    --gpgkey BDE9DC10 >>/var/log/sa-update.log 2>&1 &
 echo "CN: SpamAssassin updates are now logged at /var/log/sa-update.log"
 
 # restart the spamasassin
@@ -372,7 +414,13 @@ if [ "x$restart" = "xyes" ]; then
 fi
 
 # restart the amavis
-if [ "x$restart" = "xyes" -a -x /etc/init.d/amavis ]; then
+if [ "x$restart" = "xyes" -a -x /etc/init.d/amavisd-cn ]; then
+    if [ -x /usr/sbin/invoke-rc.d ]; then
+        invoke-rc.d --quiet amavisd-cn restart 
+    else
+        /etc/init.d/amavisd-cn restart
+    fi
+elif [ "x$restart" = "xyes" -a -x /etc/init.d/amavis ]; then
     if [ -x /usr/sbin/invoke-rc.d ]; then
         invoke-rc.d --quiet amavis restart 
     else