X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=cadf94cb17d663d8fe9d35569584c80af8790ead;hb=9a85463cbe781bb6cfee3253c025be17b3223148;hp=f59a5dfdb307241b7e4ec289165da3816f86f6c5;hpb=7b5a8df7bf52d81674ba8c90a711cfc3678cdf51;p=postfix-cn.git

diff --git a/debian/postinst b/debian/postinst
index f59a5df..cadf94c 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -7,6 +7,7 @@ set -e
 
 # Load CARNet Tools
 . /usr/share/carnet-tools/functions.sh
+
 # Load Debconf
 . /usr/share/debconf/confmodule
 
@@ -41,8 +42,6 @@ if echo $rbl | grep -q dnsbl.njabl.org; then
 fi
 
 db_get postfix-cn/matchgecos || true
-
-db_get postfix-cn/matchgecos || true
 matchgecos="$RET"
 
 hostname="`hostname`"
@@ -60,15 +59,41 @@ netaddr="$RET"
 cp -pf /etc/postfix/master.cf /etc/postfix/master.cf.dpkg-tmp.$$
 cp -pf /etc/postfix/main.cf /etc/postfix/main.cf.dpkg-tmp.$$
 
-# srediti master.cf za TLS
+# srediti master.cf za TLS & submission & retry
 if [ -f /etc/postfix/master.cf ]; then
   cp_check_and_sed '^#tlsmgr' \
                    's/^#tlsmgr/tlsmgr/g' \
                    /etc/postfix/master.cf || true
 
+  cp_check_and_sed '^#submission' \
+                   's/^#submission/submission/g' \
+                   /etc/postfix/master.cf || true
+
+  cp_check_and_sed '^#retry' \
+                   's/^#retry/retry/g' \
+                   /etc/postfix/master.cf || true
+
   cp_check_and_sed '^#smtps' \
                    's/^#smtps/smtps/g' \
                    /etc/postfix/master.cf || true
+
+  cp_check_and_sed '^#  -o' \
+                   's/^#  -o/  -o/g' \
+                   /etc/postfix/master.cf || true
+
+  for option in  "-o milter_macro_daemon_name=ORIGINATING" \
+                 "-o smtpd_recipient_restrictions=" \
+                 "-o smtpd_reject_unlisted_recipient=no" \
+                 "-o smtpd_relay_restrictions=permit_sasl_authenticated,reject" \
+                 "-o smtpd_sasl_auth_enable=yes" \
+                 "-o smtpd_tls_security_level=encrypt" \
+                 "-o smtpd_tls_wrappermode=yes" \
+                 "-o syslog_name=postfix/smtps" \
+                 "-o syslog_name=postfix/submission"; do
+  cp_check_and_sed "^#   $option" \
+                   "s/#   $option/$option/g" \
+                   /etc/postfix/master.cf || true
+  done
 fi
 
 # ovo manje/vise uzima kao default, ali u slucaju da je multihomed stroj,
@@ -85,7 +110,7 @@ postconf -e append_at_myorigin="yes"
 mynetworks="`postconf -h mynetworks`"
 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"
@@ -251,19 +276,15 @@ fi
 
 # restart saslauthd
 if [ "$restart_saslauthd" = "yes" ]; then
-  if [ -x /usr/sbin/invoke-rc.d ]; then
-    [ -x /etc/init.d/saslauthd ] && invoke-rc.d saslauthd restart
-  else
-    [ -x /etc/init.d/saslauthd ] && /etc/init.d/saslauthd restart
-  fi
+  service saslauthd restart
 fi
 
 # TLS stuff
 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_database="btree:/var/lib/postfix/smtp_scache"
 postconf -e smtp_tls_session_cache_timeout="3600s"
 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_database="btree:/var/lib/postfix/smtpd_scache"
 postconf -e smtpd_tls_session_cache_timeout="3600s"
 postconf -e tls_random_source="dev:/dev/urandom"
 postconf -e smtpd_tls_exclude_ciphers="aNULL"
@@ -347,11 +368,11 @@ 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
+#if ! grep -q "retry     unix  -       -       y       -       -       error" /etc/postfix/master.cf; then
+#  echo "CN: Please, add this line in /etc/postfix/master.cf and restart Postfix."
+#  echo "retry     unix  -       -       y       -       -       error"
+#  echo
+#fi
 
 # kreiraj aliases_gecos
 if [ -x /usr/share/postfix-cn/make-aliases-gecos.sh ]; then
@@ -361,13 +382,12 @@ if [ -x /usr/share/postfix-cn/make-aliases-gecos.sh ]; then
   fi
 fi
 
+# rjesava gresku using backwards-compatible default setting chroot=y
+postconf -F smtp/inet/chroot=y && restart_postfix="yes"
+
 # restart 
 if [ "$restart_postfix" = "yes" ]; then
-  if [ -x /usr/sbin/invoke-rc.d ]; then
-    [ -x /etc/init.d/postfix ] && invoke-rc.d postfix restart
-  else
-    [ -x /etc/init.d/postfix ] && /etc/init.d/postfix restart
-  fi
+  service postfix restart
 fi
 cp_mail postfix-cn