X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=f11ad7980fae785d169402465027c2ffe5984cc9;hb=refs%2Ftags%2Fdebian%2F2%253.4.0-5;hp=faf9cf4924cc3d7f49dc5042fe4c9353d9b0a4fb;hpb=ddf20534be4f63dda63edadad5e96f76530e2969;p=spamassassin-cn.git

diff --git a/debian/postinst b/debian/postinst
index faf9cf4..f11ad79 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
@@ -403,31 +395,25 @@ sa-update \
     --gpgkey 6C6191E3 \
     --gpgkey 24F434CE \
     --gpgkey BDE9DC10 >>/var/log/sa-update.log 2>&1 &
+
+# get rules https://sysportal.carnet.hr/node/1793
+echo "CN: Downloading new GPG key for SpamAssassin from http://spamassassin.apache.org/updates/GPG.KEY"
+echo "$(date +'%d-%m-%Y %T'): Downloading new GPG key from http://spamassassin.apache.org/updates/GPG.KEY ..." >> \
+    /var/log/sa-update.log
+wget -O - http://spamassassin.apache.org/updates/GPG.KEY 2> /dev/null | sa-update --import -
+sa-update -v
+restart=yes
 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 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