X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=spamassassin-cn.git;a=blobdiff_plain;f=debian%2Fpostinst;h=3b4574ff0cce2ddbe7de150268e360131d408225;hp=98a24b1c9f6766d4add311167426d4c58bd45f18;hb=f66fb4651481ac215af954d08750a31c73839765;hpb=5b53bbacb025060b3982aa6639ad7726b22c0fde

diff --git a/debian/postinst b/debian/postinst
index 98a24b1..3b4574f 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -238,6 +238,11 @@ if [ -f $examdir/local.cf ]; then
         $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
@@ -367,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
@@ -382,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
@@ -390,7 +397,8 @@ 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 &
 echo "CN: SpamAssassin updates are now logged at /var/log/sa-update.log"