diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2012-12-21 18:11:25 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2012-12-21 18:11:25 -0200 |
| commit | 74b5b00bbd18c1ead3a6425530666817e50ffb96 (patch) | |
| tree | 48e88993ed1b098923e68f3e4f3801142e7d7f53 | |
| parent | 0668aee2fa4e9dd881b0f1fefbe6efbe86e9c740 (diff) | |
| download | puppet-postfix-74b5b00bbd18c1ead3a6425530666817e50ffb96.tar.gz puppet-postfix-74b5b00bbd18c1ead3a6425530666817e50ffb96.tar.bz2 | |
Setting postfix_use_submission (2)
| -rw-r--r-- | templates/master.cf.debian-squeeze.erb | 2 | ||||
| -rw-r--r-- | templates/master.cf.debian-wheezy.erb | 2 | ||||
| -rw-r--r-- | templates/master.cf.redhat5.erb | 9 |
3 files changed, 7 insertions, 6 deletions
diff --git a/templates/master.cf.debian-squeeze.erb b/templates/master.cf.debian-squeeze.erb index 8e417c7..50084ef 100644 --- a/templates/master.cf.debian-squeeze.erb +++ b/templates/master.cf.debian-squeeze.erb @@ -10,7 +10,7 @@ # ========================================================================== <% if postfix_smtp_listen == 'all' %>smtp inet n - - - - smtpd <% else %><%= postfix_smtp_listen %>:smtp inet n - - - - smtpd<% end %> -<% if postfix_use_smtps == 'yes' %>submission inet n - - - - smtpd +<% if postfix_use_submission == 'yes' %>submission inet n - - - - smtpd -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes -o smtpd_client_restrictions=permit_sasl_authenticated,reject diff --git a/templates/master.cf.debian-wheezy.erb b/templates/master.cf.debian-wheezy.erb index 6a90f2d..14497f2 100644 --- a/templates/master.cf.debian-wheezy.erb +++ b/templates/master.cf.debian-wheezy.erb @@ -14,7 +14,7 @@ #smtpd pass - - - - - smtpd #dnsblog unix - - - - 0 dnsblog #tlsproxy unix - - - - 0 tlsproxy -<% if postfix_use_smtps == 'yes' %>submission inet n - - - - smtpd +<% if postfix_use_submission == 'yes' %>submission inet n - - - - smtpd -o smtpd_tls_security_level=encrypt -o smtpd_sasl_auth_enable=yes -o smtpd_client_restrictions=permit_sasl_authenticated,reject diff --git a/templates/master.cf.redhat5.erb b/templates/master.cf.redhat5.erb index 092d145..1d98d27 100644 --- a/templates/master.cf.redhat5.erb +++ b/templates/master.cf.redhat5.erb @@ -9,10 +9,11 @@ # ========================================================================== <%= postfix_smtp_listen %>:smtp inet n - n - - smtpd #smtp inet n - n - - smtpd -#submission inet n - n - - smtpd -# -o smtpd_enforce_tls=yes -# -o smtpd_sasl_auth_enable=yes -# -o smtpd_client_restrictions=permit_sasl_authenticated,reject +<% if postfix_use_submission == 'yes' %>submission inet n - n - - smtpd + -o smtpd_enforce_tls=yes + -o smtpd_sasl_auth_enable=yes + -o smtpd_client_restrictions=permit_sasl_authenticated,reject +<% end %> <% if postfix_use_smtps == 'yes' %>smtps inet n - n - - smtpd -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes |