X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fpostfix.sh;h=7aa396136d6e75544bd6d7d98bbb328e28463144;hb=1a6944c221294202ee0b5e89c2d9f4dc6fdbcc5e;hp=c89c30ef3742ed6f1d27dd08500b7f665866b674;hpb=9881eb03821c641460350eee4ed7aa0350e5c6ca;p=amavisd-cn.git

diff --git a/src/postfix.sh b/src/postfix.sh
old mode 100644
new mode 100755
index c89c30e..7aa3961
--- a/src/postfix.sh
+++ b/src/postfix.sh
@@ -1,14 +1,18 @@
 update_postfix() {
   # set up master.cf
   if [ -f /etc/postfix/master.cf ] && \
-     \( ! grep -q smtp-amavis /etc/postfix/master.cf || \
-          dpkg --compare-versions "$2" lt $MASTTMPLVERSION \); then
+     ( ! grep -q smtp-amavis /etc/postfix/master.cf || \
+          dpkg --compare-versions "$2" lt $MASTTMPLVERSION ); then
     noisy_backup /etc/postfix/master.cf
     cp-update $PKG /etc/postfix/master.cf < $MASTTMPL
+    restart_mta=1
   fi
 
   # main.cf
-  postconf -e content_filter="smtp-amavis:[127.0.0.1]:10024"
-  
-  restart_mta=1
+  if [ ! -f /etc/postfix/main.cf ] || \
+      ! grep -q "smtp-amavis:[127.0.0.1]:10024" \
+        /etc/postfix/main.cf; then
+    postconf -e content_filter="smtp-amavis:[127.0.0.1]:10024"
+    restart_mta=1
+  fi
 }