aboutsummaryrefslogtreecommitdiffstats
path: root/modules/postfix
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-01-05 00:59:39 +0000
committerMichael Scherer <misc@mageia.org>2011-01-05 00:59:39 +0000
commit41b88d492d9fe0a75dc49aa1b84c8426b6fb542d (patch)
tree1631c95acaad29235c1c05c4970d2eae5c21c84a /modules/postfix
parentc734f0eff3dde4d1e900255904ab019581a7c2ed (diff)
downloadpuppet-41b88d492d9fe0a75dc49aa1b84c8426b6fb542d.tar
puppet-41b88d492d9fe0a75dc49aa1b84c8426b6fb542d.tar.gz
puppet-41b88d492d9fe0a75dc49aa1b84c8426b6fb542d.tar.bz2
puppet-41b88d492d9fe0a75dc49aa1b84c8426b6fb542d.tar.xz
puppet-41b88d492d9fe0a75dc49aa1b84c8426b6fb542d.zip
- do not try to do ssl when we cannot, this confuse epoll
Diffstat (limited to 'modules/postfix')
-rw-r--r--modules/postfix/templates/main.cf10
1 files changed, 6 insertions, 4 deletions
diff --git a/modules/postfix/templates/main.cf b/modules/postfix/templates/main.cf
index cc759581..6af4832d 100644
--- a/modules/postfix/templates/main.cf
+++ b/modules/postfix/templates/main.cf
@@ -62,10 +62,12 @@ smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) (Mandriva Linux)
unknown_local_recipient_reject_code = 450
smtp-filter_destination_concurrency_limit = 2
lmtp-filter_destination_concurrency_limit = 2
-smtpd_use_tls = yes
-smtpd_tls_cert_file = /etc/pki/tls/certs/postfix.pem
-smtpd_tls_key_file = /etc/pki/tls/private/postfix.pem
-smtpd_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt
+# disabled for the time being, as the certificate do not exist
+# FIXME create the cert in puppet
+smtpd_use_tls = no
+#smtpd_tls_cert_file = /etc/pki/tls/certs/postfix.pem
+#smtpd_tls_key_file = /etc/pki/tls/private/postfix.pem
+#smtpd_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt
<%- if all_tags.include?('postfix::smtp_server') -%>
smtpd_etrn_restrictions = reject