aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/master.cf.debian-5.erb (renamed from templates/master.cf.debian-lenny.erb)0
-rw-r--r--templates/master.cf.debian-6.erb (renamed from templates/master.cf.debian-squeeze.erb)0
-rw-r--r--templates/master.cf.debian-7.erb (renamed from templates/master.cf.debian-wheezy.erb)48
-rw-r--r--templates/master.cf.debian-8.erb (renamed from templates/master.cf.debian-etch.erb)69
-rw-r--r--templates/master.cf.debian-sid.erb26
5 files changed, 81 insertions, 62 deletions
diff --git a/templates/master.cf.debian-lenny.erb b/templates/master.cf.debian-5.erb
index 50241b8..50241b8 100644
--- a/templates/master.cf.debian-lenny.erb
+++ b/templates/master.cf.debian-5.erb
diff --git a/templates/master.cf.debian-squeeze.erb b/templates/master.cf.debian-6.erb
index 7fef418..7fef418 100644
--- a/templates/master.cf.debian-squeeze.erb
+++ b/templates/master.cf.debian-6.erb
diff --git a/templates/master.cf.debian-wheezy.erb b/templates/master.cf.debian-7.erb
index c62abcd..7b653fb 100644
--- a/templates/master.cf.debian-wheezy.erb
+++ b/templates/master.cf.debian-7.erb
@@ -8,25 +8,25 @@
# service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (yes) (never) (100)
# ==========================================================================
-<% if smtp_listen == 'all' %>smtp inet n - - - - smtpd
-<% else %><%= 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 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 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
-o milter_macro_daemon_name=ORIGINATING
<% end %>
-#628 inet n - - - - qmqpd
+#628 inet n - - - - qmqpd
pickup fifo n - - 60 1 pickup
cleanup unix n - - - 0 cleanup
qmgr fifo n - n 300 1 qmgr
@@ -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 use_amavisd == 'yes' %>
+<% if @use_amavisd == 'yes' %>
amavis unix - - - - 2 smtp
-o smtp_data_done_timeout=1200
-o smtp_send_xforward_command=yes
@@ -131,45 +131,27 @@ amavis unix - - - - 2 smtp
-o mynetworks=127.0.0.0/8
-o strict_rfc821_envelopes=yes
-o receive_override_options=no_unknown_recipient_checks,no_header_body_checks
+ -o smtpd_bind_address=127.0.0.1
<% end %>
-<% if use_dovecot_lda == 'yes' %>
+<% if @use_dovecot_lda == 'yes' %>
dovecot unix - n n - - pipe
- flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/dovecot-lda -f ${sender} -d ${user}@${nexthop} -m ${extension}
+ flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -n -m ${extension}
<% end %>
-<% if use_schleuder == 'yes' %>
+<% if @use_schleuder == 'yes' %>
schleuder unix - n n - - pipe
- flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user}@${nexthop}
+ flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user}
<% end %>
-<% if 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 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 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 %>
-<%- if use_gpg_mailgate == 'yes' %>
-gpg-mailgate unix - n n - - pipe
- flags= user=gpg_mailgate argv=/usr/local/bin/gpg-mailgate.py
-127.0.0.1:10028 inet n - n - 10 smtpd
- -o content_filter=
- -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks
- -o smtpd_helo_restrictions=
- -o smtpd_client_restrictions=
- -o smtpd_sender_restrictions=
- -o smtpd_recipient_restrictions=permit_mynetworks,reject
- -o mynetworks=127.0.0.0/8
- -o smtpd_authorized_xforward_hosts=127.0.0.0/8
-<%end %>
-<%- unless mastercf_tail.to_s.empty? then -%>
-<%= mastercf_tail %>
+<%- unless @mastercf_tail.to_s.empty? then -%>
+<%= @mastercf_tail %>
<%- end -%>
diff --git a/templates/master.cf.debian-etch.erb b/templates/master.cf.debian-8.erb
index b49a399..7b653fb 100644
--- a/templates/master.cf.debian-etch.erb
+++ b/templates/master.cf.debian-8.erb
@@ -1,23 +1,30 @@
-# file managed by puppet
#
# Postfix master process configuration file. For details on the format
# of the file, see the master(5) manual page (command: "man 5 master").
#
+# Do not forget to execute "postfix reload" after editing this file.
+#
# ==========================================================================
# service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (yes) (never) (100)
# ==========================================================================
-<% 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
+<% 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 @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 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
+ -o milter_macro_daemon_name=ORIGINATING
<% end %>
#628 inet n - - - - qmqpd
pickup fifo n - - 60 1 pickup
@@ -32,19 +39,21 @@ trace unix - - - - 0 bounce
verify unix - - - - 1 verify
flush unix n - - 1000? 0 flush
proxymap unix - - n - - proxymap
+proxywrite unix - - n - 1 proxymap
smtp unix - - - - - smtp
# When relaying mail as backup MX, disable fallback_relay to avoid MX loops
relay unix - - - - - smtp
- -o fallback_relay=
+ -o smtp_fallback_relay=
# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
showq unix n - - - - showq
error unix - - - - - error
+retry unix - - - - - error
discard unix - - - - - discard
local unix - n n - - local
virtual unix - n n - - virtual
lmtp unix - - - - - lmtp
anvil unix - - - - 1 anvil
-scache unix - - - - 1 scache
+scache unix - - - - 1 scache
#
# ====================================================================
# Interfaces to non-Postfix software. Be sure to examine the manual
@@ -61,6 +70,33 @@ scache unix - - - - 1 scache
maildrop unix - n n - - pipe
flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}
#
+# ====================================================================
+#
+# Recent Cyrus versions can use the existing "lmtp" master.cf entry.
+#
+# Specify in cyrus.conf:
+# lmtp cmd="lmtpd -a" listen="localhost:lmtp" proto=tcp4
+#
+# Specify in main.cf one or more of the following:
+# mailbox_transport = lmtp:inet:localhost
+# virtual_transport = lmtp:inet:localhost
+#
+# ====================================================================
+#
+# Cyrus 2.1.5 (Amos Gouaux)
+# Also specify in main.cf: cyrus_destination_recipient_limit=1
+#
+#cyrus unix - n n - - pipe
+# user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
+#
+# ====================================================================
+# Old example of delivery via Cyrus.
+#
+#old-cyrus unix - n n - - pipe
+# flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
+#
+# ====================================================================
+#
# See the Postfix UUCP_README file for configuration details.
#
uucp unix - n n - - pipe
@@ -77,7 +113,8 @@ 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 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 +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 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}
+ flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -n -m ${extension}
<% end %>
-<% if use_schleuder == 'yes' %>
+<% if @use_schleuder == 'yes' %>
schleuder unix - n n - - pipe
flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user}
<% end %>
-<% if 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 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 mastercf_tail.to_s.empty? then -%>
-<%= 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 d5a5a14..7b653fb 100644
--- a/templates/master.cf.debian-sid.erb
+++ b/templates/master.cf.debian-sid.erb
@@ -8,25 +8,25 @@
# service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (yes) (never) (100)
# ==========================================================================
-<% if smtp_listen == 'all' %>smtp inet n - - - - smtpd
-<% else %><%= 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 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 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
-o milter_macro_daemon_name=ORIGINATING
<% end %>
-#628 inet n - - - - qmqpd
+#628 inet n - - - - qmqpd
pickup fifo n - - 60 1 pickup
cleanup unix n - - - 0 cleanup
qmgr fifo n - n 300 1 qmgr
@@ -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 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 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}
+ flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -n -m ${extension}
<% end %>
-<% if use_schleuder == 'yes' %>
+<% if @use_schleuder == 'yes' %>
schleuder unix - n n - - pipe
flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user}
<% end %>
-<% if 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 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 mastercf_tail.to_s.empty? then -%>
-<%= 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-18 05:08:48 +0000