X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=e5d5a8f37b517e13f00d5af967b626f5d3a23645;hb=refs%2Ftags%2Fdebian%2F2%253.3.4;hp=98a24b1c9f6766d4add311167426d4c58bd45f18;hpb=5b53bbacb025060b3982aa6639ad7726b22c0fde;p=spamassassin-cn.git

diff --git a/debian/postinst b/debian/postinst
index 98a24b1..e5d5a8f 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -367,7 +367,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
@@ -382,6 +382,8 @@ sa-update --import /etc/spamassassin/sa-keys.pgp \
 # 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,7 +392,8 @@ 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"