# 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
mv -f $confdir/local.cf.$$.$$ $confdir/local.cf.$$
rm -f $confdir/local.cf.$$.$$
+ # calculate trusted networks
+ cp_get_netaddr || true
+ netaddr="$RET"
+ trusted_networks=$(awk '/^trusted_networks/ { print $2 }' \
+ $confdir/local.cf.$$)
+ for i in "127.0.0.0/8" "$netaddr"; do
+ if ! echo "$trusted_networks" | grep -q "$i"; then
+ trusted_networks="$trusted_networks $i"
+ fi
+ done
+ 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"
+
# different than template
if ! cmp -s $confdir/local.cf.$$ $confdir/local.cf; then
# backup if not zero size
# 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