[ "$1" = "configure" ] || exit 0
[ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
-# Load CARNet Tools
+# Load CARNET Tools
. /usr/share/carnet-tools/functions.sh
# Load Debconf
/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 --import /usr/share/spamassassin-cn/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