From: Dinko Korunic <kreator@carnet.hr>
Date: Mon, 14 Apr 2008 20:54:01 +0000 (+0200)
Subject: - bolji regex za match konfiguracije u main.cf od Postfixa za slucaj kad
X-Git-Tag: v2.6.4-1~12
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=amavisd-cn.git;a=commitdiff_plain;h=9667493ddaf016f1faf52e09e071973daab7c346

- bolji regex za match konfiguracije u main.cf od Postfixa za slucaj kad
  treba aktivirati smtp amavis servis na 10024
Signed-off-by: Dinko Korunic <kreator@carnet.hr>
---

diff --git a/src/postfix.sh b/src/postfix.sh
index 7aa3961..9099243 100755
--- a/src/postfix.sh
+++ b/src/postfix.sh
@@ -8,9 +8,9 @@ update_postfix() {
     restart_mta=1
   fi
 
-  # main.cf
+  # set up main.cf
   if [ ! -f /etc/postfix/main.cf ] || \
-      ! grep -q "smtp-amavis:[127.0.0.1]:10024" \
+      ! grep -q "^content_filter[\t ]*=[\t ]*smtp-amavis:\[127.0.0.1\]:10024[\t ]*" \
         /etc/postfix/main.cf; then
     postconf -e content_filter="smtp-amavis:[127.0.0.1]:10024"
     restart_mta=1