From ac077435805efa4c4d9e4880b5dd452a7a53c350 Mon Sep 17 00:00:00 2001 From: Ivan Rako <irako@nekkar.carnet.hr> Date: Sat, 11 Jun 2011 15:14:11 +0200 Subject: [PATCH] sitne izmjene --- debian/changelog | 6 ++++++ debian/postinst | 10 ++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index c3ed64a..78ddfca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +postfix-cn (2.7.1-3) stable; urgency=medium + + * Jos sitnih izmjena u postinstu vezanih uz TLS + + -- Ivan Rako <Ivan.Rako@CARNet.hr> Sat, 11 Jun 2011 15:13:55 +0200 + postfix-cn (2.7.1-2) stable; urgency=medium * Izmjene za TLS (sad se koristi certifikat iz paketa ssl-cert) diff --git a/debian/postinst b/debian/postinst index 2dad0b1..dd617e1 100755 --- a/debian/postinst +++ b/debian/postinst @@ -258,7 +258,7 @@ 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 @@ -266,21 +266,15 @@ 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 -- 1.7.10.4