X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=89372df4bcfde90c68426aaf250caf399c2ef85c;hb=d2f6433fbb31ca2da066fee1b7f0e37ecd88067c;hp=dd617e12859e48fa15846715fd2ce32e4f6ecbc4;hpb=ac077435805efa4c4d9e4880b5dd452a7a53c350;p=postfix-cn.git

diff --git a/debian/postinst b/debian/postinst
index dd617e1..89372df 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -31,6 +31,17 @@ if echo $rbl | grep -q opm.blitzed.org; then
   db_set postfix-cn/rbl "$rbl" || true
 fi
 
+# Wed, 12 Jun 2013 15:15:28 +0200
+# dnsbl.njabl.org je ugasen 2013-03
+if echo $rbl | grep -q dnsbl.njabl.org; then
+  rbl="`echo $rbl | sed 's/dnsbl.njabl.org, //g'`"
+  # za svaki slucaj, ako je na kraju
+  rbl="`echo $rbl | sed 's/dnsbl.njabl.org//g'`"
+  db_set postfix-cn/rbl "$rbl" || true
+fi
+
+db_get postfix-cn/matchgecos || true
+
 db_get postfix-cn/matchgecos || true
 matchgecos="$RET"
 
@@ -70,11 +81,11 @@ postconf -e myorigin="$mailname"
 postconf -e append_dot_mydomain="yes"
 postconf -e append_at_myorigin="yes"
 
-# dodaj 127.0.0.0/8 i netaddr
+# dodaj 127.0.0.0/8, netaddr i ipv6-localhost
 mynetworks="`postconf -h mynetworks`"
-for i in "127.0.0.0/8" "$netaddr"; do
+for i in "127.0.0.0/8" "$netaddr" "[::1]/128"; do
   if ! echo $mynetworks | grep -q $i; then
-   mynetworks="$mynetworks, $i"
+   mynetworks="$mynetworks $i"
   fi
 done
 postconf -e mynetworks="$mynetworks"
@@ -248,10 +259,10 @@ if [ "$restart_saslauthd" = "yes" ]; then
 fi
 
 # TLS stuff
-postconf -e smtp_use_tls="yes"
+postconf -e smtp_tls_security_level="may"
 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_security_level="may"
 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"
@@ -359,3 +370,5 @@ if [ "$restart_postfix" = "yes" ]; then
   fi
 fi
 cp_mail postfix-cn
+
+#DEBHELPER#