$confdir/local.cf.$$ || true
echo "CN: Activated $trusted_networks as trusted networks"
+ if dpkg --compare-versions "$2" lt "2:3.3.5"; then
+ cp_check_and_sed "^bayes_auto_expire 1" \
+ "s#^bayes_auto_expire .*#bayes_auto_expire 0#g" \
+ $confdir/local.cf.$$ || true
+ echo "CN: Set bayes_auto_expire to 0"
+ fi
+
# different than template
if ! cmp -s $confdir/local.cf.$$ $confdir/local.cf; then
# backup if not zero size
mv -f $i.$$ $i
fi
rm -f $i.$$
+
+ # enable AWL
+ cp -f $i $i.$$
+ plugin="loadplugin Mail::SpamAssassin::Plugin::AWL"
+ cp_check_and_sed "^#$plugin.*$" \
+ "s/^#$plugin.*$/$plugin/g" $i.$$ || true
+ if ! cmp -s $i.$$ $i; then
+ mv -f $i.$$ $i
+ fi
+ rm -f $i.$$
done
# check and replace /etc/default/spamasassin if needed
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
# 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
/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 || true
+ --gpgkey BDE9DC10 >>/var/log/sa-update.log 2>&1 &
echo "CN: SpamAssassin updates are now logged at /var/log/sa-update.log"
# restart the spamasassin
fi
# restart the amavis
-if [ "x$restart" = "xyes" -a -x /etc/init.d/amavis ]; then
+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