summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reiter <bernhard@intevation.de>2006-01-11 14:23:57 (GMT)
committerBernhard Reiter <bernhard@intevation.de>2006-01-11 14:23:57 (GMT)
commitfc188c71ac0fd2fed1e3be9a89db0bb008c40c34 (patch)
tree0c88fd0ccce50d9e245512b503829ba3b6513a17
parentf15be757df3e2a40e6f47722cddc6b279ccce64c (diff)
downloadkolab-conf-fc188c71ac0fd2fed1e3be9a89db0bb008c40c34.tar.gz
Avoiding that postfix will log the password with TLS.
Possibly fixing issue968 (Postfix logs password on failure).
-rw-r--r--conf/templates/main.cf.template2
-rw-r--r--conf/templates/master.cf.template3
2 files changed, 2 insertions, 3 deletions
diff --git a/conf/templates/main.cf.template b/conf/templates/main.cf.template
index 2d2d17b..349662d 100644
--- a/conf/templates/main.cf.template
+++ b/conf/templates/main.cf.template
@@ -78,7 +78,7 @@ smtpd_tls_cert_file = @l_prefix@/etc/kolab/cert.pem
#smtpd_tls_dkey_file = $smtpd_tls_dcert_file
#smtpd_tls_key_file = $smtpd_tls_cert_file
smtpd_tls_key_file = @l_prefix@/etc/kolab/key.pem
-#smtpd_tls_loglevel = 3
+smtpd_tls_loglevel = 1
smtpd_tls_received_header = no
#smtpd_tls_req_ccert = no
#smtpd_tls_session_cache_database =
diff --git a/conf/templates/master.cf.template b/conf/templates/master.cf.template
index a4357d0..a3c0f20 100644
--- a/conf/templates/master.cf.template
+++ b/conf/templates/master.cf.template
@@ -33,8 +33,7 @@ tlsmgr unix - - n 1000? 1 tlsmgr
#uucp unix - n n - - pipe flags=Fqhu user=uucp argv=/kolab/bin/uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
#ifmail unix - n n - - pipe flags=F user=ftn argv=/kolab/bin/ifmail -r $nexthop ($recipient)
#bsmtp unix - n n - - pipe flags=Fq. user=foo argv=/kolab/bin/bsmtp -f $sender $nexthop $recipient
-465 inet n - n - - smtpd -v -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
-#587 inet n - n - - smtpd -v -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
+465 inet n - n - - smtpd -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
post-cleanup unix n - n - 0 cleanup -o virtual_maps=
smtp-amavis unix - - n - 2 smtp
-o smtp_data_done_timeout=1200