X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=040623fb3013ed502d3831ee5bbdce949425a674;hb=d44d52a09708085dd941ea7cd1d3ba85ad3afbfd;hp=cf883e146c44cd63fa187d5cd62ebb09459a296e;hpb=04407e16b48e6889e4969503ddd479f9ebde1929;p=postfix-cn.git

diff --git a/debian/postinst b/debian/postinst
index cf883e1..040623f 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -5,7 +5,7 @@ set -e
 [ "$1" = "configure" ] || exit 0
 [ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
 
-# Load CARNet Tools
+# Load CARNET Tools
 . /usr/share/carnet-tools/functions.sh
 
 # Load Debconf
@@ -94,6 +94,14 @@ if [ -f /etc/postfix/master.cf ]; then
                    "s/#   $option/$option/g" \
                    /etc/postfix/master.cf || true
   done
+
+  for option in  "o smtpd_client_restrictions=" \
+                 "o smtpd_helo_restrictions=" \
+                 "o smtpd_sender_restrictions="; 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,
@@ -281,10 +289,10 @@ 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"
@@ -382,6 +390,9 @@ 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
   service postfix restart