netaddr="$RET"
# ... get already configured trusted networks
trusted_networks=$(awk '/^trusted_networks/ { print $2 }' \
- $confdir/local.cf.$$)
+ $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" | grep -q "127.0.0.0/8"; then
+ 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
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
# 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