From 78a1d1ae8f4063ac0557b012456feee166b303c2 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 17 Sep 2014 21:00:03 +0000 Subject: Resync' the sid master.cf template with current Debian one. Updated on 2015-07-18, postfix 2.11.3-1. --- templates/master.cf.debian-sid.erb | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/templates/master.cf.debian-sid.erb b/templates/master.cf.debian-sid.erb index d5a5a14..c93fcfb 100644 --- a/templates/master.cf.debian-sid.erb +++ b/templates/master.cf.debian-sid.erb @@ -1,6 +1,7 @@ # # Postfix master process configuration file. For details on the format -# of the file, see the master(5) manual page (command: "man 5 master"). +# of the file, see the master(5) manual page (command: "man 5 master" or +# on-line: http://www.postfix.org/master.5.html). # # Do not forget to execute "postfix reload" after editing this file. # @@ -15,22 +16,34 @@ #dnsblog unix - - - - 0 dnsblog #tlsproxy unix - - - - 0 tlsproxy <% if use_submission == 'yes' %>submission inet n - - - - smtpd + -o syslog_name=postfix/submission -o smtpd_tls_security_level=encrypt -o smtpd_sasl_auth_enable=yes - -o smtpd_client_restrictions=permit_sasl_authenticated,reject + -o smtpd_reject_unlisted_recipient=no + -o smtpd_client_restrictions=$mua_client_restrictions + -o smtpd_helo_restrictions=$mua_helo_restrictions + -o smtpd_sender_restrictions=$mua_sender_restrictions + -o smtpd_recipient_restrictions= + -o smtpd_relay_restrictions=permit_sasl_authenticated,reject -o milter_macro_daemon_name=ORIGINATING <% end %> <% if use_smtps == 'yes' %>smtps inet n - - - - smtpd + -o syslog_name=postfix/smtps -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes - -o smtpd_client_restrictions=permit_sasl_authenticated,reject + -o smtpd_reject_unlisted_recipient=no + -o smtpd_client_restrictions=$mua_client_restrictions + -o smtpd_helo_restrictions=$mua_helo_restrictions + -o smtpd_sender_restrictions=$mua_sender_restrictions + -o smtpd_recipient_restrictions= + -o smtpd_relay_restrictions=permit_sasl_authenticated,reject -o milter_macro_daemon_name=ORIGINATING <% end %> #628 inet n - - - - qmqpd -pickup fifo n - - 60 1 pickup +pickup unix n - - 60 1 pickup cleanup unix n - - - 0 cleanup -qmgr fifo n - n 300 1 qmgr -#qmgr fifo n - - 300 1 oqmgr +qmgr unix n - n 300 1 qmgr +#qmgr unix n - n 300 1 oqmgr tlsmgr unix - - - 1000? 1 tlsmgr rewrite unix - - - - - trivial-rewrite bounce unix - - - - 0 bounce -- cgit v1.2.3 From 59fc59053a92c7a32cc3f2d4da62280569902ce2 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 18 Jul 2015 09:20:09 +0000 Subject: Debian sid's master.cf: merge custom dovecot/deliver options from the Jessie template. These changes were introduced in other templates in commit 6a44990, let's propagate them to the sid template. --- templates/master.cf.debian-sid.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/master.cf.debian-sid.erb b/templates/master.cf.debian-sid.erb index c93fcfb..943581d 100644 --- a/templates/master.cf.debian-sid.erb +++ b/templates/master.cf.debian-sid.erb @@ -148,7 +148,7 @@ amavis unix - - - - 2 smtp <% end %> <% 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' %> schleuder unix - n n - - pipe -- cgit v1.2.3 From 2710748ce8457131ef982054fb798695c66285f6 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 15 Mar 2016 10:28:56 +0000 Subject: Add symlink to sid template where this module is looking for it (#12). Fixes this regression brought by dropping lsb facts: Could not find template 'postfix/master.cf.debian-stretch/sid.erb' --- templates/master.cf.debian-stretch/sid.erb | 1 + 1 file changed, 1 insertion(+) create mode 120000 templates/master.cf.debian-stretch/sid.erb diff --git a/templates/master.cf.debian-stretch/sid.erb b/templates/master.cf.debian-stretch/sid.erb new file mode 120000 index 0000000..e861e80 --- /dev/null +++ b/templates/master.cf.debian-stretch/sid.erb @@ -0,0 +1 @@ +../master.cf.debian-sid.erb \ No newline at end of file -- cgit v1.2.3 From 3ee64eb1cec8e5429425906e51d951a6462715e7 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 15 Mar 2016 10:51:46 +0000 Subject: master.cf: on Debian distros that ship dovecot 2.x, don't pass obsolete -n, but instead -a "${recipient}" (#13). --- templates/master.cf.debian-8.erb | 2 +- templates/master.cf.debian-sid.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/master.cf.debian-8.erb b/templates/master.cf.debian-8.erb index 7b653fb..0c5c30c 100644 --- a/templates/master.cf.debian-8.erb +++ b/templates/master.cf.debian-8.erb @@ -135,7 +135,7 @@ amavis unix - - - - 2 smtp <% end %> <% 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} -m ${extension} -a "${recipient}" <% end %> <% if @use_schleuder == 'yes' %> schleuder unix - n n - - pipe diff --git a/templates/master.cf.debian-sid.erb b/templates/master.cf.debian-sid.erb index 7b653fb..0c5c30c 100644 --- a/templates/master.cf.debian-sid.erb +++ b/templates/master.cf.debian-sid.erb @@ -135,7 +135,7 @@ amavis unix - - - - 2 smtp <% end %> <% 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} -m ${extension} -a "${recipient}" <% end %> <% if @use_schleuder == 'yes' %> schleuder unix - n n - - pipe -- cgit v1.2.3 From e62fc0c0e5748230859479b28c820721436fc0e1 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Thu, 22 Sep 2016 09:25:12 +0000 Subject: Subscribe to the Concat resource instead of the File one. This is needed with recent versions of the concat module. --- manifests/tlspolicy.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/tlspolicy.pp b/manifests/tlspolicy.pp index d901710..bf96503 100644 --- a/manifests/tlspolicy.pp +++ b/manifests/tlspolicy.pp @@ -30,7 +30,7 @@ class postfix::tlspolicy( postfix::hash { '/etc/postfix/tls_policy': source => "$postfix_merged_tlspolicy", - subscribe => File["$postfix_merged_tlspolicy"], + subscribe => Concat["$postfix_merged_tlspolicy"], } postfix::config { -- cgit v1.2.3 From 8594fa820c5310cd8f159bd7cdcee20f1b201ef9 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 21 Jan 2017 12:07:24 +0000 Subject: Fork sid template for Stretch. --- templates/master.cf.debian-9.erb | 170 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) create mode 100644 templates/master.cf.debian-9.erb diff --git a/templates/master.cf.debian-9.erb b/templates/master.cf.debian-9.erb new file mode 100644 index 0000000..397c089 --- /dev/null +++ b/templates/master.cf.debian-9.erb @@ -0,0 +1,170 @@ +# +# Postfix master process configuration file. For details on the format +# of the file, see the master(5) manual page (command: "man 5 master" or +# on-line: http://www.postfix.org/master.5.html). +# +# 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 %> +#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 syslog_name=postfix/submission + -o smtpd_tls_security_level=encrypt + -o smtpd_sasl_auth_enable=yes + -o smtpd_reject_unlisted_recipient=no + -o smtpd_client_restrictions=$mua_client_restrictions + -o smtpd_helo_restrictions=$mua_helo_restrictions + -o smtpd_sender_restrictions=$mua_sender_restrictions + -o smtpd_recipient_restrictions= + -o smtpd_relay_restrictions=permit_sasl_authenticated,reject + -o milter_macro_daemon_name=ORIGINATING +<% end %> +<% if @use_smtps == 'yes' %>smtps inet n - - - - smtpd + -o syslog_name=postfix/smtps + -o smtpd_tls_wrappermode=yes + -o smtpd_sasl_auth_enable=yes + -o smtpd_reject_unlisted_recipient=no + -o smtpd_client_restrictions=$mua_client_restrictions + -o smtpd_helo_restrictions=$mua_helo_restrictions + -o smtpd_sender_restrictions=$mua_sender_restrictions + -o smtpd_recipient_restrictions= + -o smtpd_relay_restrictions=permit_sasl_authenticated,reject + -o milter_macro_daemon_name=ORIGINATING +<% end %> +#628 inet n - - - - qmqpd +pickup unix n - - 60 1 pickup +cleanup unix n - - - 0 cleanup +qmgr unix n - n 300 1 qmgr +#qmgr unix n - n 300 1 oqmgr +tlsmgr unix - - - 1000? 1 tlsmgr +rewrite unix - - - - - trivial-rewrite +bounce unix - - - - 0 bounce +defer unix - - - - 0 bounce +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 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 +# +# ==================================================================== +# Interfaces to non-Postfix software. Be sure to examine the manual +# pages of the non-Postfix software to find out what options it wants. +# +# Many of the following services use the Postfix pipe(8) delivery +# agent. See the pipe(8) man page for information about ${recipient} +# and other message envelope options. +# ==================================================================== +# +# maildrop. See the Postfix MAILDROP_README file for details. +# Also specify in main.cf: maildrop_destination_recipient_limit=1 +# +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 + flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient) +# +# Other external delivery methods. +# +ifmail unix - n n - - pipe + flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient) +bsmtp unix - n n - - pipe + flags=Fq. user=bsmtp argv=/usr/lib/bsmtp/bsmtp -t$nexthop -f$sender $recipient +scalemail-backend unix - n n - 2 pipe + flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store ${nexthop} ${user} ${extension} +mailman unix - n n - - pipe + flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py + ${nexthop} ${user} + +<% if @use_amavisd == 'yes' %> +amavis unix - - - - 2 smtp + -o smtp_data_done_timeout=1200 + -o smtp_send_xforward_command=yes + +127.0.0.1:10025 inet n - - - - smtpd + -o content_filter= + -o local_recipient_maps= + -o relay_recipient_maps= + -o smtpd_restriction_classes= + -o smtpd_client_restrictions= + -o smtpd_helo_restrictions= + -o smtpd_sender_restrictions= + -o smtpd_recipient_restrictions=permit_mynetworks,reject + -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' %> +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 @use_schleuder == 'yes' %> +schleuder unix - n n - - pipe + flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user} +<% end %> +<% 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' %> +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 %> +<%- end -%> -- cgit v1.2.3