diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2017-12-30 13:06:21 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2017-12-30 13:06:21 -0200 |
| commit | 48c85fae1a13745e582a9d2fef12bdb50a0aa39f (patch) | |
| tree | 65f0da4a6d7e2a74c3e081a9712b334d3f8716e4 /templates/master.cf.debian-sid.erb | |
| parent | c38a65d0c8565ebe3d22a72c396f233929b93287 (diff) | |
| parent | cebe42c1bcf7ebfbb989c1b6a7d416d98c947e64 (diff) | |
| download | puppet-postfix-upstream.tar.gz puppet-postfix-upstream.tar.bz2 | |
Merge branch 'master' of https://gitlab.com/shared-puppet-modules-group/postfix into upstreamupstream
Diffstat (limited to 'templates/master.cf.debian-sid.erb')
| -rw-r--r-- | templates/master.cf.debian-sid.erb | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/templates/master.cf.debian-sid.erb b/templates/master.cf.debian-sid.erb index 7b653fb..e96f657 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 +#628 inet n - - - - qmqpd +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 @@ -135,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 -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 |