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
matchgecos="$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,
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"
# 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_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"
postconf -e smtpd_tls_exclude_ciphers="aNULL"
postconf -e smtpd_tls_mandatory_exclude_ciphers="aNULL"
-# nije potrebno generiranje certifikata jer postfix koristi ssl-cert
+# nije potrebno generiranje certifikata jer postfix koristi paket ssl-cert
# ako je postavljen snakeoil certifikat za smtpd_tls_* postavi isti za smtp_tls_*
smtpd_tls_cert_file="`postconf -h smtpd_tls_cert_file`"
if [ "$smtpd_tls_cert_file" = "/etc/ssl/certs/ssl-cert-snakeoil.pem" ]; then
postconf -e smtp_tls_key_file="/etc/ssl/private/ssl-cert-snakeoil.key"
fi
-# ako je prazan, postavi na defaultni iz ssl-cert
+# ako je prazan, postavi na defaultni iz paketa ssl-cert
smtpd_tls_cert_file="`postconf -h smtpd_tls_cert_file`"
if [ -z "$smtpd_tls_cert_file" ]; then
postconf -e smtpd_tls_cert_file="/etc/ssl/certs/ssl-cert-snakeoil.pem"
-fi
-smtpd_tls_key_file="`postconf -h smtpd_tls_key_file`"
-if [ -z "$smtpd_tls_key_file" ]; then
postconf -e smtpd_tls_key_file="/etc/ssl/private/ssl-cert-snakeoil.key"
fi
smtp_tls_cert_file="`postconf -h smtp_tls_cert_file`"
if [ -z "$smtp_tls_cert_file" ]; then
postconf -e smtp_tls_cert_file="/etc/ssl/certs/ssl-cert-snakeoil.pem"
-fi
-smtp_tls_key_file="`postconf -h smtp_tls_key_file`"
-if [ -z "$smtp_tls_key_file" ]; then
postconf -e smtp_tls_key_file="/etc/ssl/private/ssl-cert-snakeoil.key"
fi
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
# 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
+
+#DEBHELPER#
projects / postfix-cn.git / blobdiff