izmjene u postinstu

[postfix-cn.git] / debian / postinst

diff --git a/debian/postinst b/debian/postinst
index eab468e..0e063bf 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -81,14 +81,17 @@ postconf -e mynetworks="$mynetworks"
 
 # obrisati $mydomain, ako je upgrade sa starije verzije
 # te srediti mydestination
-if dpkg --compare-versions "$2" lt 2.3.8-1; then
+if dpkg --compare-versions "$2" lt 2.3.8-2; then
   mydestination="`postconf -h mydestination`"
   if echo $mydestination | grep -q ", \$mydomain"; then
     mydestination="`echo $mydestination | sed 's/, \$mydomain//g'`"
   fi
-  if echo $mydestination | grep -q "localhost.\$mydomain"; then
+  if ! echo $mydestination | grep -q "localhost.\$mydomain"; then
     mydestination="$mydestination, localhost.\$mydomain"
   fi
+  if ! echo $mydestination | grep -q "\$myhostname"; then
+    mydestination="\$myhostname, $mydestination"
+  fi
   postconf -e mydestination="$mydestination"
 fi
 
@@ -168,8 +171,8 @@ if [ "$rbl" ]; then
   done
 fi
 
-# dodaj check_policy_service i permit na kraj
-smtpd_recipient_restrictions="$smtpd_recipient_restrictions, check_policy_service inet:127.0.0.1:60000, permit"
+# dodaj permit na kraj
+smtpd_recipient_restrictions="$smtpd_recipient_restrictions, permit"
 postconf -e smtpd_recipient_restrictions="$smtpd_recipient_restrictions"
 
 # SASL stuff
@@ -348,6 +351,12 @@ if ! cmp -s /etc/postfix/main.cf /etc/postfix/main.cf.dpkg-tmp.$$; then
 fi
 rm -f /etc/postfix/main.cf.dpkg-tmp.$$
 
+if ! grep -q "retry     unix  -       -       -       -       -       error" /etc/postfix/master.cf; then
+  echo "CN: Please, add this line in /etc/postfix/master.cf and restart Postfix."
+  echo "retry     unix  -       -       -       -       -       error"
+  echo
+fi
+
 # kreiraj aliases_gecos
 if [ -x /usr/share/postfix-cn/make-aliases-gecos.sh ]; then
   if [ "$matchgecos" = "true" ]; then