From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 10 Nov 2010 18:37:19 +0000 (-0200)
Subject: Using smtp_tls_security_level/smtpd_tls_security_level instead of smtp_use_tls/smtpd_... 
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d04748ea87c5d7e84fd96a5e8d6fbedeca1e25f8;p=puppet-mail.git

Using smtp_tls_security_level/smtpd_tls_security_level instead of smtp_use_tls/smtpd_use_tls
---

diff --git a/manifests/tls.pp b/manifests/tls.pp
index 2a12468..98ccd4f 100644
--- a/manifests/tls.pp
+++ b/manifests/tls.pp
@@ -1,10 +1,10 @@
 class mail::tls {
   # TLS
-  postfix::config { "smtpd_tls_cert_file":  value => '/etc/ssl/certs/cert.crt' }
-  postfix::config { "smtpd_tls_key_file":   value => '/etc/ssl/private/cert.pem' }
-  postfix::config { "smtpd_use_tls":        value => 'yes' }
-  postfix::config { "smtp_use_tls":         value => 'yes' }
-  postfix::config { "smtp_tls_policy_maps": value => 'hash:/etc/postfix/tls_policy' }
+  postfix::config { "smtpd_tls_cert_file":      value => '/etc/ssl/certs/cert.crt' }
+  postfix::config { "smtpd_tls_key_file":       value => '/etc/ssl/private/cert.pem' }
+  postfix::config { "smtpd_tls_security_level": value => 'may' }
+  postfix::config { "smtp_tls_security_level":  value => 'may' }
+  postfix::config { "smtp_tls_policy_maps":     value => 'hash:/etc/postfix/tls_policy' }
 
   postfix::hash { "/etc/postfix/tls_policy":
     ensure => present,