X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=fcdaf01e3d8e254ce2469bdd62850446311b130c;hb=aab7c6a746d8bf20a00327815490fef24f26eebf;hp=868dad43a8b7589623b2aa16ce5b5a3f9ba36361;hpb=83c59ff2f6f893e986abcec3b8ba20682ec906de;p=postfix-cn.git diff --git a/debian/postinst b/debian/postinst index 868dad4..fcdaf01 100755 --- a/debian/postinst +++ b/debian/postinst @@ -280,14 +280,14 @@ 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/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/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" # ako je postavljen neki drugi certifikat, ne diraj smtp_tls_cert_file="`postconf -h smtp_tls_cert_file`" if [ -z "$smtp_tls_cert_file" ]; then @@ -297,6 +297,14 @@ 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/$cert.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="\$smtp_tls_cert_file" +fi +smtpd_tls_key_file="`postconf -h smtpd_tls_key_file`" +if [ -z "$smtpd_tls_key_file" ]; then + postconf -e smtpd_tls_key_file="\$smtpd_tls_cert_file" +fi # prije bilo u /etc/postfix/, od verzije 2.1.5-2 je u /var/spool/postfix [ -f /etc/postfix/smtp_scache.dir ] && rm -f /etc/postfix/smtp_scache.dir