Setting postfix_use_submission (2)

diff --git a/templates/master.cf.debian-squeeze.erb b/templates/master.cf.debian-squeeze.erb
index 8e417c766065d5a3a256e33f67e099ca10f8efbf..50084efda3cc21957069b3fd0662f4be6017c921 100644 (file)
--- 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 6a90f2d3648a9ca7ee8f2fa9bc993f60257f9f5f..14497f2625b93418e9bc4c69e150781e0f14042f 100644 (file)
--- 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 092d14500e94ea2979ad5474f9c5514566d89b77..1d98d27558ab9ff8e5e978c2258bdc2d0b551334 100644 (file)
--- 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