X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=497a2df67808c47ca484f6db31ee73bf20df0f29;hb=c59439c108f7b2c1df699111f62a7a3483d2896b;hp=dae4cb2091f3c86ac8bfba72d80eae85e6e5af33;hpb=7e9107b7fa1a92e21a0a45e5133860f5a909064d;p=spamassassin-cn.git

diff --git a/debian/postinst b/debian/postinst
index dae4cb2..497a2df 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,37 +1,16 @@
 #!/bin/sh
-# postinst script for spamassassin-cn
-#
-# see: dh_installdeb(1)
 
 set -e
 
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-
-case "$1" in
-    configure|reconfigure)
-      # continue below
-    ;;
-
-    *)
-        exit 0
-    ;;
-esac
-
-# import CN-functions
+[ "$1" = "configure" ] || exit 0
+[ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
+
+# Load CARNet Tools
 . /usr/share/carnet-tools/functions.sh
 
-# load Debconf
+# Load Debconf
 . /usr/share/debconf/confmodule
+
 db_version 2.0
 
 umask 022
@@ -59,7 +38,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 +66,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
 
@@ -375,37 +354,51 @@ if [ ! -d /etc/spamassassin/sa-update-keys ]; then
         /etc/spamassassin/sa-update-keys/secring.gpg
     chmod -R go-rwx /etc/spamassassin/sa-update-keys
 fi
-sa-update --import /etc/spamassassin/sa-keys.pgp \
+sa-update --gpghomedir /etc/spamassassin/sa-update-keys --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 --gpghomedir /etc/spamassassin/sa-update-keys --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
+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!"
-    
+
+# clean old sought.rules.yerp.org
+echo "CN: Cleaning old YERP rules..."
+find /var/lib/spamassassin -iname \*_yerp_\* -print0 | xargs -0r rm -rf
+sed -i -e '/sought.rules.yerp.org/d' /etc/spamassassin/sa-update.channels
+
+# add spamassassin.heinlein-support.de
+#echo "CN: Adding spamassassin.heinlein-support.de to /etc/spamassassin/sa-update.channels..."
+#if ! grep -q spamassassin.heinlein-support.de /etc/spamassassin/sa-update.channels; then
+#  echo spamassassin.heinlein-support.de >> /etc/spamassassin/sa-update.channels
+#fi
+
 # get/update the rules
 echo "CN: Downloading new SpamAssassin rules and updating in background"
 echo "$(date +'%d-%m-%Y %T'): Fetching new SA rules..." >> \
     /var/log/sa-update.log
 sa-update \
     --channelfile /etc/spamassassin/sa-update.channels \
-    --allowplugins \
-    --gpgkey 6C6191E3 \
-    --gpgkey 24F434CE \
-    --gpgkey BDE9DC10 >>/var/log/sa-update.log 2>&1 &
+    --gpghomedir /etc/spamassassin/sa-update-keys \
+    --allowplugins >>/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
     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