izmjene u postinstu, kriva sintaksa naredbe service

[spamassassin-cn.git] / debian / postinst

diff --git a/debian/postinst b/debian/postinst
index e5d5a8f..fb6e041 100755 (executable)
--- 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
@@ -400,27 +399,13 @@ 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