umask 022
+# clean up old debconf questions that are no longer in this package
+if dpkg --compare-versions "$2" lt "2:3.1.7-4"; then
+ db_unregister spamassassin-cn/usedcc || true
+fi
+
db_get spamassassin-cn/usebayes || true
use_bayes="$RET"
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
+ systemctl stop spamassassin
+ 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
+ systemctl stop spamassassin
+ restart=yes
fi
if [ -d "/var/run/spamd" ]; then
# old enough
if [ -s $confdir/local.cf ] &&
- dpkg --compare-versions "$2" lt "2:3.0.3-3"; then
+ dpkg --compare-versions "$2" lt "2:3.2.5-4"; then
echo "CN: Backing up old version of $confdir/local.cf in /var/backups"
cp_backup_conffile $confdir/local.cf
rm -f $confdir/local.cf
done
# remove obsolete options from old SA
- egrep -v '^(bayes_use_chi2_combining|ok_languages|pyzor)' \
+ egrep -v '^(bayes_use_chi2_combining|ok_languages|use_pyzor|pyzor_|use_dcc|dcc_)' \
$confdir/local.cf.$$ > $confdir/local.cf.$$.$$ && \
mv -f $confdir/local.cf.$$.$$ $confdir/local.cf.$$
rm -f $confdir/local.cf.$$.$$
+ # calculate trusted networks
+ cp_get_netaddr || true
+ netaddr="$RET"
+ # ... get already configured trusted networks
+ trusted_networks=$(awk '/^trusted_networks/ { print $2 }' \
+ $confdir/local.cf.$$ | sed -e 's/,/ /g')
+ # ... merge with local networks configured on eth interfaces
+ for i in $netaddr; do
+ if ! echo "$trusted_networks" | grep -q "$i"; then
+ trusted_networks="$trusted_networks $i"
+ fi
+ done
+ # ... merge with Postfix ranges
+ if [ -x /usr/sbin/postconf ]; then
+ for i in $(postconf -h mynetworks | sed -e 's/,/ /g'); do
+ if ! echo "$trusted_networks" | grep -q "$i"; then
+ trusted_networks="$trusted_networks $i"
+ fi
+ done
+ fi
+ # ... strip 127/8 range
+ for i in $trusted_networks; do
+ if ! echo "$i" | egrep -q \
+ "127.0.0.0/8|\[::1\]/128|\[::ffff:127.0.0.0\]/104"; then
+ trusted_networks_clean="$trusted_networks_clean $i"
+ fi
+ done
+ # ... strip left and right blanks from final string
+ trusted_networks_clean=$(echo "$trusted_networks_clean" \
+ | sed 's/^[ \t]*//;s/[ \t]*$//')
+ # ... and replace if non-zero
+ if [ ! -z "$trusted_networks_clean" ]; then
+ trusted_networks=$trusted_networks_clean
+ fi
+ cp_check_and_sed "^trusted_networks " \
+ "s#^trusted_networks .*#trusted_networks $trusted_networks#g" \
+ $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
# cleanup the AWL
if getent passwd amavis >/dev/null 2>&1; then
- if [ -s ~amavis/.spamassassin/auto-whitelist ]; then
+ AWL=~amavis/.spamassassin/auto-whitelist
+ if [ -s $AWL ]; then
echo "CN: Cleaning the Amavis auto-whitelist"
su -c '/usr/bin/check_whitelist --clean' - amavis >/dev/null 2>&1 \
|| true
+
+ # see if size is still unacceptable
+ SIZE=$(du -ks $AWL | awk '{print $1}')
+ if [ $SIZE -ge 51200 ]; then
+ echo "CN: Size of AWL database > 50MB, doing full cleanup"
+ cp /dev/null $AWL
+ fi
fi
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
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
+ systemctl restart spamassassin
fi
# restart the amavis
if [ "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
+ systemctl restart amavis
fi
# dh_installdeb will replace this with shell code automatically
projects / spamassassin-cn.git / blobdiff