dodan lintian-overrides

[spamassassin-cn.git] / debian / postinst

diff --git a/debian/postinst b/debian/postinst
index dae4cb2..37e44f8 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -59,7 +59,7 @@ db_stop || true
 if [ "$run_as_user" = "non-root" ]; then
     if ! grep -q '^OPTIONS=".*username=spamd"' \
             /etc/default/spamassassin; then
-        service stop spamassassin
+        service spamassassin stop
         rstart=yes
     fi
 
@@ -87,7 +87,7 @@ if [ "$run_as_user" = "non-root" ]; then
 elif [ "$run_as_user" = "root" ]; then
     if grep -q '^OPTIONS=".*username=spamd"' \
             /etc/default/spamassassin; then
-        service stop spamassassin
+        service spamassassin stop
         restart=yes
     fi
 
@@ -378,6 +378,10 @@ 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
@@ -400,12 +404,12 @@ echo "CN: SpamAssassin updates are now logged at /var/log/sa-update.log"
 # restart the spamasassin
 if [ "x$restart" = "xyes" ]; then
     pkill -f /usr/sbin/spamd || true
-    service restart spamassassin
+    service spamassassin restart
 fi
 
 # restart the amavis
 if [ "x$restart" = "xyes" -a -x /etc/init.d/amavis ]; then
-    service restart amavis
+    service amavis restart
 fi
 
 # dh_installdeb will replace this with shell code automatically