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

diff --git a/debian/postinst b/debian/postinst
index 98a24b1..37e44f8 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -59,12 +59,8 @@ db_stop || true
 if [ "$run_as_user" = "non-root" ]; then
     if ! grep -q '^OPTIONS=".*username=spamd"' \
             /etc/default/spamassassin; then
-        if [ -x /usr/sbin/invoke-rc.d ]; then
-            invoke-rc.d --quiet spamassassin stop
-        else
-            /etc/init.d/spamassassin stop
-        fi
-    rstart=yes
+        service spamassassin stop
+        rstart=yes
     fi
 
     if ! getent group spamd >/dev/null 2>&1; then
@@ -91,12 +87,8 @@ if [ "$run_as_user" = "non-root" ]; then
 elif [ "$run_as_user" = "root" ]; then
     if grep -q '^OPTIONS=".*username=spamd"' \
             /etc/default/spamassassin; then
-        if [ -x /usr/sbin/invoke-rc.d ]; then
-            invoke-rc.d --quiet spamassassin stop
-        else
-            /etc/init.d/spamassassin stop
-        fi
-    restart=yes
+        service spamassassin stop
+        restart=yes
     fi
 
     if [ -d "/var/run/spamd" ]; then
@@ -238,6 +230,13 @@ if [ -f $examdir/local.cf ]; then
         $confdir/local.cf.$$ || true
     echo "CN: Activated $trusted_networks as trusted networks"
 
+    if dpkg --compare-versions "$2" lt "2:3.3.5"; then
+      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"
+    fi
+        
     # different than template
     if ! cmp -s $confdir/local.cf.$$ $confdir/local.cf; then
         # backup if not zero size
@@ -367,7 +366,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
@@ -379,9 +378,15 @@ fi
 sa-update --import /etc/spamassassin/sa-keys.pgp \
     >>/var/log/sa-update.log 2>&1 || true
 
+# import http://spamassassin.apache.org/updates/GPG.KEY
+echo "CN: Importing new http://spamassassin.apache.org/updates/GPG.KEY..."
+sa-update --import /usr/share/spamassassin-cn/GPG.KEY
+
 # 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,34 +395,21 @@ 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"
 
 # restart the spamasassin
 if [ "x$restart" = "xyes" ]; then
-    if [ -x /usr/sbin/invoke-rc.d ]; then
-        pkill -f /usr/sbin/spamd || true
-        invoke-rc.d --quiet spamassassin restart
-    else
-        /etc/init.d/spamassassin restart
-    fi
+    pkill -f /usr/sbin/spamd || true
+    service spamassassin restart
 fi
 
 # restart the amavis
-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
-        /etc/init.d/amavis restart
-    fi
+if [ "x$restart" = "xyes" -a -x /etc/init.d/amavis ]; then
+    service amavis restart
 fi
 
 # dh_installdeb will replace this with shell code automatically