X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=868dad43a8b7589623b2aa16ce5b5a3f9ba36361;hb=83c59ff2f6f893e986abcec3b8ba20682ec906de;hp=a0293f1165f198145792143993dde3a7d4bcd838;hpb=a9f62dfe5407d99b410b7989b3efd58a9a399ad1;p=postfix-cn.git

diff --git a/debian/postinst b/debian/postinst
index a0293f1..868dad4 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -81,11 +81,17 @@ postconf -e mynetworks="$mynetworks"
 
 # obrisati $mydomain, ako je upgrade sa starije verzije
 # te srediti mydestination
-if dpkg --compare-versions "$2" lt 2.1.5-8; 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
+    mydestination="$mydestination, localhost.\$mydomain"
+  fi
+  if ! echo $mydestination | grep -q "\$myhostname"; then
+    mydestination="\$myhostname, $mydestination"
+  fi
   postconf -e mydestination="$mydestination"
 fi
 
@@ -165,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
@@ -275,11 +281,11 @@ fi
 # TLS stuff
 postconf -e smtp_use_tls="yes"
 postconf -e smtp_tls_key_file="\$smtp_tls_cert_file"
-postconf -e smtp_tls_session_cache_database="sdbm:/var/spool/postfix/smtp_scache"
+postconf -e smtp_tls_session_cache_database="sdbm:/var/lib/postfix/smtp_scache"
 postconf -e smtp_tls_session_cache_timeout="3600s"
 postconf -e smtpd_use_tls="yes"
 postconf -e smtpd_tls_key_file="\$smtpd_tls_cert_file"
-postconf -e smtpd_tls_session_cache_database="sdbm:/var/spool/postfix/smtpd_scache"
+postconf -e smtpd_tls_session_cache_database="sdbm:/var/lib/postfix/smtpd_scache"
 postconf -e smtpd_tls_session_cache_timeout="3600s"
 postconf -e tls_random_source="dev:/dev/urandom"
 # ako je postavljen neki drugi certifikat, ne diraj
@@ -297,6 +303,11 @@ fi
 [ -f /etc/postfix/smtp_scache.pag ] && rm -f /etc/postfix/smtp_scache.pag
 [ -f /etc/postfix/smtpd_scache.dir ] && rm -f /etc/postfix/smtpd_scache.dir
 [ -f /etc/postfix/smtpd_scache.pag ] && rm -f /etc/postfix/smtpd_scache.pag
+# prije bilo u /var/spool/postfix/, od verzije 2.5.5 je u /var/lib/postfix
+[ -f /var/spool/postfix/smtp_scache.dir ] && rm -f /var/spool/postfix/smtp_scache.dir
+[ -f /var/spool/postfix/smtp_scache.pag ] && rm -f /var/spool/postfix/smtp_scache.pag
+[ -f /var/spool/postfix/smtpd_scache.dir ] && rm -f /var/spool/postfix/smtpd_scache.dir
+[ -f /var/spool/postfix/smtpd_scache.pag ] && rm -f /var/spool/postfix/smtpd_scache.pag
 
 # debconf stop
 db_go || true
@@ -345,6 +356,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
@@ -353,30 +370,6 @@ if [ -x /usr/share/postfix-cn/make-aliases-gecos.sh ]; then
   fi
 fi
 
-if dpkg --compare-versions "$2" lt 2.1.5-6 && \
-   [ -f /etc/postgrey/whitelist_clients ]; then
-  # dodaj CARNet MX u /etc/postgrey/whitelist_clients
-  cp-update postfix-cn /etc/postgrey/whitelist_clients < /usr/share/postfix-cn/carnet_whitelist_clients
-  restart_postgrey="yes"
-fi
-
-if [ -f /etc/default/postgrey ]; then
-  if ! grep -q "^POSTGREY_OPTS=.*--delay" /etc/default/postgrey; then
-    cp_check_and_sed 'POSTGREY_OPTS=' \
-                     's/^POSTGREY_OPTS="/POSTGREY_OPTS="--delay=58 /g' \
-		     /etc/default/postgrey || true
-  restart_postgrey="yes"
-  fi
-fi
-
-if [ "$restart_postgrey" = "yes" ]; then
-  if [ -x /usr/sbin/invoke-rc.d ]; then
-    [ -x /etc/init.d/postgrey ] && invoke-rc.d postgrey restart
-  else
-    [ -x /etc/init.d/postgrey ] && /etc/init.d/postgrey restart
-  fi
-fi
-
 # restart 
 if [ "$restart_postfix" = "yes" ]; then
   if [ -x /usr/sbin/invoke-rc.d ]; then