- pametniji restart Postfixa u slucaju promjena u konfiguraciji

[amavisd-cn.git] / src / postfix.sh

diff --git a/src/postfix.sh b/src/postfix.sh
old mode 100644 (file)
new mode 100755 (executable)
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
 }