aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/master.cf.debian-etch.erb22
-rw-r--r--templates/master.cf.debian-lenny.erb22
-rw-r--r--templates/master.cf.debian-sid.erb22
-rw-r--r--templates/master.cf.debian-squeeze.erb24
-rw-r--r--templates/master.cf.debian-wheezy.erb22
-rw-r--r--templates/master.cf.redhat5.erb10
6 files changed, 61 insertions, 61 deletions
diff --git a/templates/master.cf.debian-etch.erb b/templates/master.cf.debian-etch.erb
index aaea777..b49a399 100644
--- a/templates/master.cf.debian-etch.erb
+++ b/templates/master.cf.debian-etch.erb
@@ -7,14 +7,14 @@
# service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (yes) (never) (100)
# ==========================================================================
-<% if postfix_smtp_listen == 'all' %>smtp inet n - - - - smtpd
-<% else %><%= postfix_smtp_listen %>:smtp inet n - - - - smtpd<% end %>
-<% if postfix_use_submission == 'yes' %>submission inet n - - - - smtpd
+<% if smtp_listen == 'all' %>smtp inet n - - - - smtpd
+<% else %><%= smtp_listen %>:smtp inet n - - - - smtpd<% end %>
+<% if 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
<% end %>
-<% if postfix_use_smtps == 'yes' %>smtps inet n - - - - smtpd
+<% if use_smtps == 'yes' %>smtps inet n - - - - smtpd
-o smtpd_tls_wrappermode=yes
-o smtpd_sasl_auth_enable=yes
-o smtpd_client_restrictions=permit_sasl_authenticated,reject
@@ -77,7 +77,7 @@ scalemail-backend unix - n n - 2 pipe
mailman unix - n n - - pipe
flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
${nexthop} ${user}
-<% if postfix_use_amavisd == 'yes' %>
+<% if use_amavisd == 'yes' %>
amavis unix - - - - 2 smtp
-o smtp_data_done_timeout=1200
-o smtp_send_xforward_command=yes
@@ -96,25 +96,25 @@ amavis unix - - - - 2 smtp
-o receive_override_options=no_unknown_recipient_checks,no_header_body_checks
-o smtpd_bind_address=127.0.0.1
<% end %>
-<% if postfix_use_dovecot_lda == 'yes' %>
+<% if use_dovecot_lda == 'yes' %>
dovecot unix - n n - - pipe
flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -n -m ${extension}
<% end %>
-<% if postfix_use_schleuder == 'yes' %>
+<% if use_schleuder == 'yes' %>
schleuder unix - n n - - pipe
flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user}
<% end %>
-<% if postfix_use_sympa == 'yes' %>
+<% if use_sympa == 'yes' %>
sympa unix - n n - - pipe
flags=R user=sympa argv=/usr/lib/sympa/bin/queue ${recipient}
sympabounce unix - n n - - pipe
flags=R user=sympa argv=/usr/lib/sympa/bin/bouncequeue ${user}
<% end %>
-<% if postfix_use_mlmmj == 'yes' %>
+<% if use_mlmmj == 'yes' %>
mlmmj unix - n n - - pipe
flags=DORhu user=mlmmj argv=/usr/bin/mlmmj-recieve -F -L /var/spool/mlmmj/$nexthop/
<%- end -%>
-<%- unless postfix_mastercf_tail.to_s.empty? then -%>
-<%= postfix_mastercf_tail %>
+<%- unless mastercf_tail.to_s.empty? then -%>
+<%= mastercf_tail %>
<%- end -%>
diff --git a/templates/master.cf.debian-lenny.erb b/templates/master.cf.debian-lenny.erb
index ab71f97..50241b8 100644
--- a/templates/master.cf.debian-lenny.erb
+++ b/templates/master.cf.debian-lenny.erb
@@ -9,15 +9,15 @@
# service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (yes) (never) (100)
# ==========================================================================
-<% if postfix_smtp_listen == 'all' %>smtp inet n - - - - smtpd
-<% else %><%= postfix_smtp_listen %>:smtp inet n - - - - smtpd<% end %>
-<% if postfix_use_submission == 'yes' %>submission inet n - - - - smtpd
+<% if smtp_listen == 'all' %>smtp inet n - - - - smtpd
+<% else %><%= smtp_listen %>:smtp inet n - - - - smtpd<% end %>
+<% if 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
-o milter_macro_daemon_name=ORIGINATING
<% end %>
-<% if postfix_use_smtps == 'yes' %>smtps inet n - - - - smtpd
+<% if use_smtps == 'yes' %>smtps inet n - - - - smtpd
-o smtpd_tls_wrappermode=yes
-o smtpd_sasl_auth_enable=yes
-o smtpd_client_restrictions=permit_sasl_authenticated,reject
@@ -83,7 +83,7 @@ scalemail-backend unix - n n - 2 pipe
mailman unix - n n - - pipe
flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
${nexthop} ${user}
-<% if postfix_use_amavisd == 'yes' %>
+<% if use_amavisd == 'yes' %>
amavis unix - - - - 2 smtp
-o smtp_data_done_timeout=1200
-o smtp_send_xforward_command=yes
@@ -102,25 +102,25 @@ amavis unix - - - - 2 smtp
-o receive_override_options=no_unknown_recipient_checks,no_header_body_checks
-o smtpd_bind_address=127.0.0.1
<% end %>
-<% if postfix_use_dovecot_lda == 'yes' %>
+<% if use_dovecot_lda == 'yes' %>
dovecot unix - n n - - pipe
flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -n -m ${extension}
<% end %>
-<% if postfix_use_schleuder == 'yes' %>
+<% if use_schleuder == 'yes' %>
schleuder unix - n n - - pipe
flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user}
<% end %>
-<% if postfix_use_sympa == 'yes' %>
+<% if use_sympa == 'yes' %>
sympa unix - n n - - pipe
flags=R user=sympa argv=/usr/lib/sympa/bin/queue ${recipient}
sympabounce unix - n n - - pipe
flags=R user=sympa argv=/usr/lib/sympa/bin/bouncequeue ${user}
<% end %>
-<% if postfix_use_mlmmj == 'yes' %>
+<% if use_mlmmj == 'yes' %>
mlmmj unix - n n - - pipe
flags=DORhu user=mlmmj argv=/usr/bin/mlmmj-recieve -F -L /var/spool/mlmmj/$nexthop/
<%- end -%>
-<%- unless postfix_mastercf_tail.to_s.empty? then -%>
-<%= postfix_mastercf_tail %>
+<%- unless mastercf_tail.to_s.empty? then -%>
+<%= mastercf_tail %>
<%- end -%>
diff --git a/templates/master.cf.debian-sid.erb b/templates/master.cf.debian-sid.erb
index 3450369..d5a5a14 100644
--- a/templates/master.cf.debian-sid.erb
+++ b/templates/master.cf.debian-sid.erb
@@ -8,19 +8,19 @@
# service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (yes) (never) (100)
# ==========================================================================
-<% if postfix_smtp_listen == 'all' %>smtp inet n - - - - smtpd
-<% else %><%= postfix_smtp_listen %>:smtp inet n - - - - smtpd<% end %>
+<% if smtp_listen == 'all' %>smtp inet n - - - - smtpd
+<% else %><%= smtp_listen %>:smtp inet n - - - - smtpd<% end %>
#smtp inet n - - - 1 postscreen
#smtpd pass - - - - - smtpd
#dnsblog unix - - - - 0 dnsblog
#tlsproxy unix - - - - 0 tlsproxy
-<% if postfix_use_submission == 'yes' %>submission inet n - - - - smtpd
+<% if 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
-o milter_macro_daemon_name=ORIGINATING
<% end %>
-<% if postfix_use_smtps == 'yes' %>smtps inet n - - - - smtpd
+<% if use_smtps == 'yes' %>smtps inet n - - - - smtpd
-o smtpd_tls_wrappermode=yes
-o smtpd_sasl_auth_enable=yes
-o smtpd_client_restrictions=permit_sasl_authenticated,reject
@@ -114,7 +114,7 @@ mailman unix - n n - - pipe
flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
${nexthop} ${user}
-<% if postfix_use_amavisd == 'yes' %>
+<% if use_amavisd == 'yes' %>
amavis unix - - - - 2 smtp
-o smtp_data_done_timeout=1200
-o smtp_send_xforward_command=yes
@@ -133,25 +133,25 @@ amavis unix - - - - 2 smtp
-o receive_override_options=no_unknown_recipient_checks,no_header_body_checks
-o smtpd_bind_address=127.0.0.1
<% end %>
-<% if postfix_use_dovecot_lda == 'yes' %>
+<% if use_dovecot_lda == 'yes' %>
dovecot unix - n n - - pipe
flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -d ${recipient}
<% end %>
-<% if postfix_use_schleuder == 'yes' %>
+<% if use_schleuder == 'yes' %>
schleuder unix - n n - - pipe
flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user}
<% end %>
-<% if postfix_use_sympa == 'yes' %>
+<% if use_sympa == 'yes' %>
sympa unix - n n - - pipe
flags=R user=sympa argv=/usr/lib/sympa/bin/queue ${recipient}
sympabounce unix - n n - - pipe
flags=R user=sympa argv=/usr/lib/sympa/bin/bouncequeue ${user}
<% end %>
-<% if postfix_use_mlmmj == 'yes' %>
+<% if use_mlmmj == 'yes' %>
mlmmj unix - n n - - pipe
flags=DORhu user=mlmmj argv=/usr/bin/mlmmj-recieve -F -L /var/spool/mlmmj/$nexthop/
<%- end -%>
-<%- unless postfix_mastercf_tail.to_s.empty? then -%>
-<%= postfix_mastercf_tail %>
+<%- unless mastercf_tail.to_s.empty? then -%>
+<%= mastercf_tail %>
<%- end -%>
diff --git a/templates/master.cf.debian-squeeze.erb b/templates/master.cf.debian-squeeze.erb
index 50084ef..9ce3264 100644
--- a/templates/master.cf.debian-squeeze.erb
+++ b/templates/master.cf.debian-squeeze.erb
@@ -8,9 +8,9 @@
# service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (yes) (never) (100)
# ==========================================================================
-<% if postfix_smtp_listen == 'all' %>smtp inet n - - - - smtpd
-<% else %><%= postfix_smtp_listen %>:smtp inet n - - - - smtpd<% end %>
-<% if postfix_use_submission == 'yes' %>submission inet n - - - - smtpd
+<% if smtp_listen == 'all' %>smtp inet n - - - - smtpd
+<% else %><%= smtp_listen %>:smtp inet n - - - - smtpd<% end %>
+<% if 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
@@ -22,7 +22,7 @@
# -o smtpd_sasl_auth_enable=yes
# -o smtpd_client_restrictions=permit_sasl_authenticated,reject
# -o milter_macro_daemon_name=ORIGINATING
-<% if postfix_use_smtps == 'yes' %>smtps inet n - - - - smtpd
+<% if use_smtps == 'yes' %>smtps inet n - - - - smtpd
-o smtpd_tls_wrappermode=yes
-o smtpd_sasl_auth_enable=yes
-o smtpd_client_restrictions=permit_sasl_authenticated,reject
@@ -109,7 +109,7 @@ scalemail-backend unix - n n - 2 pipe
mailman unix - n n - - pipe
flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
${nexthop} ${user}
-<% if postfix_use_amavisd == 'yes' %>
+<% if use_amavisd == 'yes' %>
amavis unix - - - - 2 smtp
-o smtp_data_done_timeout=1200
-o smtp_send_xforward_command=yes
@@ -128,31 +128,31 @@ amavis unix - - - - 2 smtp
-o receive_override_options=no_unknown_recipient_checks,no_header_body_checks
-o smtpd_bind_address=127.0.0.1
<% end %>
-<% if postfix_use_dovecot_lda == 'yes' %>
+<% if use_dovecot_lda == 'yes' %>
dovecot unix - n n - - pipe
flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -n -m ${extension}
<% end %>
-<% if postfix_use_schleuder == 'yes' %>
+<% if use_schleuder == 'yes' %>
schleuder unix - n n - - pipe
flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user}
<% end %>
-<% if postfix_use_sympa == 'yes' %>
+<% if use_sympa == 'yes' %>
sympa unix - n n - - pipe
flags=R user=sympa argv=/usr/lib/sympa/bin/queue ${recipient}
sympabounce unix - n n - - pipe
flags=R user=sympa argv=/usr/lib/sympa/bin/bouncequeue ${user}
<% end %>
-<% if postfix_use_mlmmj == 'yes' %>
+<% if use_mlmmj == 'yes' %>
mlmmj unix - n n - - pipe
flags=DORhu user=mlmmj argv=/usr/bin/mlmmj-recieve -F -L /var/spool/mlmmj/$nexthop/
<%- end -%>
-<% if postfix_use_firma == 'yes' %>
+<% if use_firma == 'yes' %>
firma unix - n n - - pipe
flags=DRhu user=firma argv=/var/lib/firma/firma -p ${user}
firmarequest unix - n n - - pipe
flags=DRhu user=firma argv=/var/lib/firma/firma -e ${user}
<% end %>
-<%- unless postfix_mastercf_tail.to_s.empty? then -%>
-<%= postfix_mastercf_tail %>
+<%- unless mastercf_tail.to_s.empty? then -%>
+<%= mastercf_tail %>
<%- end -%>
diff --git a/templates/master.cf.debian-wheezy.erb b/templates/master.cf.debian-wheezy.erb
index 14497f2..cc4bbf0 100644
--- a/templates/master.cf.debian-wheezy.erb
+++ b/templates/master.cf.debian-wheezy.erb
@@ -8,19 +8,19 @@
# service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (yes) (never) (100)
# ==========================================================================
-<% if postfix_smtp_listen == 'all' %>smtp inet n - - - - smtpd
-<% else %><%= postfix_smtp_listen %>:smtp inet n - - - - smtpd<% end %>
+<% if smtp_listen == 'all' %>smtp inet n - - - - smtpd
+<% else %><%= smtp_listen %>:smtp inet n - - - - smtpd<% end %>
#smtp inet n - - - 1 postscreen
#smtpd pass - - - - - smtpd
#dnsblog unix - - - - 0 dnsblog
#tlsproxy unix - - - - 0 tlsproxy
-<% if postfix_use_submission == 'yes' %>submission inet n - - - - smtpd
+<% if 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
-o milter_macro_daemon_name=ORIGINATING
<% end %>
-<% if postfix_use_smtps == 'yes' %>smtps inet n - - - - smtpd
+<% if use_smtps == 'yes' %>smtps inet n - - - - smtpd
-o smtpd_tls_wrappermode=yes
-o smtpd_sasl_auth_enable=yes
-o smtpd_client_restrictions=permit_sasl_authenticated,reject
@@ -114,7 +114,7 @@ mailman unix - n n - - pipe
flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
${nexthop} ${user}
-<% if postfix_use_amavisd == 'yes' %>
+<% if use_amavisd == 'yes' %>
amavis unix - - - - 2 smtp
-o smtp_data_done_timeout=1200
-o smtp_send_xforward_command=yes
@@ -133,25 +133,25 @@ amavis unix - - - - 2 smtp
-o receive_override_options=no_unknown_recipient_checks,no_header_body_checks
-o smtpd_bind_address=127.0.0.1
<% end %>
-<% if postfix_use_dovecot_lda == 'yes' %>
+<% if use_dovecot_lda == 'yes' %>
dovecot unix - n n - - pipe
flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -n -m ${extension}
<% end %>
-<% if postfix_use_schleuder == 'yes' %>
+<% if use_schleuder == 'yes' %>
schleuder unix - n n - - pipe
flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user}
<% end %>
-<% if postfix_use_sympa == 'yes' %>
+<% if use_sympa == 'yes' %>
sympa unix - n n - - pipe
flags=R user=sympa argv=/usr/lib/sympa/bin/queue ${recipient}
sympabounce unix - n n - - pipe
flags=R user=sympa argv=/usr/lib/sympa/bin/bouncequeue ${user}
<% end %>
-<% if postfix_use_mlmmj == 'yes' %>
+<% if use_mlmmj == 'yes' %>
mlmmj unix - n n - - pipe
flags=DORhu user=mlmmj argv=/usr/bin/mlmmj-recieve -F -L /var/spool/mlmmj/$nexthop/
<%- end -%>
-<%- unless postfix_mastercf_tail.to_s.empty? then -%>
-<%= postfix_mastercf_tail %>
+<%- unless mastercf_tail.to_s.empty? then -%>
+<%= mastercf_tail %>
<%- end -%>
diff --git a/templates/master.cf.redhat5.erb b/templates/master.cf.redhat5.erb
index 1d98d27..01741e4 100644
--- a/templates/master.cf.redhat5.erb
+++ b/templates/master.cf.redhat5.erb
@@ -7,14 +7,14 @@
# service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (yes) (never) (100)
# ==========================================================================
-<%= postfix_smtp_listen %>:smtp inet n - n - - smtpd
+<%= smtp_listen %>:smtp inet n - n - - smtpd
#smtp inet n - n - - smtpd
-<% if postfix_use_submission == 'yes' %>submission inet n - n - - smtpd
+<% if 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
+<% if use_smtps == 'yes' %>smtps inet n - n - - smtpd
-o smtpd_tls_wrappermode=yes
-o smtpd_sasl_auth_enable=yes
-o smtpd_client_restrictions=permit_sasl_authenticated,reject
@@ -82,6 +82,6 @@ ifmail unix - n n - - pipe
bsmtp unix - n n - - pipe
flags=Fq. user=foo argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient
-<%- unless postfix_mastercf_tail.to_s.empty? then -%>
-<%= postfix_mastercf_tail %>
+<%- unless mastercf_tail.to_s.empty? then -%>
+<%= mastercf_tail %>
<%- end -%>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 13:28:10 +0000