if [ "$run_as_user" = "non-root" ]; then
if ! grep -q '^OPTIONS=".*username=spamd"' \
/etc/default/spamassassin; then
- if [ -x /usr/sbin/invoke-rc.d ]; then
- invoke-rc.d --quiet spamassassin stop
- else
- /etc/init.d/spamassassin stop
- fi
- rstart=yes
+ service spamassassin stop
+ rstart=yes
fi
if ! getent group spamd >/dev/null 2>&1; then
elif [ "$run_as_user" = "root" ]; then
if grep -q '^OPTIONS=".*username=spamd"' \
/etc/default/spamassassin; then
- if [ -x /usr/sbin/invoke-rc.d ]; then
- invoke-rc.d --quiet spamassassin stop
- else
- /etc/init.d/spamassassin stop
- fi
- restart=yes
+ service spamassassin stop
+ restart=yes
fi
if [ -d "/var/run/spamd" ]; then
$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
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 &
+
+# get rules https://sysportal.carnet.hr/node/1793
+echo "CN: Downloading new GPG key for SpamAssassin from http://spamassassin.apache.org/updates/GPG.KEY"
+echo "$(date +'%d-%m-%Y %T'): Downloading new GPG key from http://spamassassin.apache.org/updates/GPG.KEY ..." >> \
+ /var/log/sa-update.log
+wget -O - http://spamassassin.apache.org/updates/GPG.KEY 2> /dev/null | sa-update --import -
+sa-update -v
+restart=yes
echo "CN: SpamAssassin updates are now logged at /var/log/sa-update.log"
# restart the spamasassin
if [ "x$restart" = "xyes" ]; then
- if [ -x /usr/sbin/invoke-rc.d ]; then
- pkill -f /usr/sbin/spamd || true
- invoke-rc.d --quiet spamassassin restart
- else
- /etc/init.d/spamassassin restart
- fi
+ pkill -f /usr/sbin/spamd || true
+ service spamassassin restart
fi
# restart the amavis
-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
- /etc/init.d/amavis restart
- fi
+if [ "x$restart" = "xyes" -a -x /etc/init.d/amavis ]; then
+ service amavis restart
fi
# dh_installdeb will replace this with shell code automatically