X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=7f549ccd856acd5319599a0da7467f090b8ab819;hb=daacbf1a940e88e0b1d94196b2db87aa29c2c797;hp=e931e54d852717789e405d2101197314494d794b;hpb=451bbd0115b7bbec4281d40d43d5bbd8b889a316;p=spamassassin-cn.git

diff --git a/debian/postinst b/debian/postinst
index e931e54..7f549cc 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -204,7 +204,7 @@ if [ -f $examdir/local.cf ]; then
     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
@@ -213,7 +213,7 @@ if [ -f $examdir/local.cf ]; then
     done
     # ... merge with Postfix ranges
     if [ -x /usr/sbin/postconf ]; then
-        for i in $(postconf -h mynetworks); do
+        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
@@ -221,10 +221,12 @@ if [ -f $examdir/local.cf ]; then
     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
@@ -285,6 +287,16 @@ for i in $list; do
         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
@@ -394,7 +406,13 @@ if [ "x$restart" = "xyes" ]; then
 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