projects
/
postfix-cn.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ec953e8
)
ne diraj tls_key_file
author
Ivan Rako
<irako@nekkar.carnet.hr>
Mon, 21 Dec 2009 12:22:18 +0000
(13:22 +0100)
committer
Ivan Rako
<irako@nekkar.carnet.hr>
Mon, 21 Dec 2009 12:22:18 +0000
(13:22 +0100)
debian/postinst
patch
|
blob
|
history
diff --git
a/debian/postinst
b/debian/postinst
index
80c04dc
..
df8fdbf
100755
(executable)
--- a/
debian/postinst
+++ b/
debian/postinst
@@
-280,11
+280,9
@@
fi
# TLS stuff
postconf -e smtp_use_tls="yes"
# 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 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_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"
@@
-301,6
+299,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
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
# 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