diff options
| author | intrigeri <intrigeri@boum.org> | 2014-09-17 21:00:03 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2015-07-18 09:16:26 +0000 |
| commit | 78a1d1ae8f4063ac0557b012456feee166b303c2 (patch) | |
| tree | 82ab01f4b9eea34a25b27fd1024317eeda91c663 | |
| parent | 1fe24e63dc39bef3379b0e75d8c81f4f6db0072e (diff) | |
| download | puppet-postfix-78a1d1ae8f4063ac0557b012456feee166b303c2.tar.gz puppet-postfix-78a1d1ae8f4063ac0557b012456feee166b303c2.tar.bz2 | |
Resync' the sid master.cf template with current Debian one.
Updated on 2015-07-18, postfix 2.11.3-1.
| -rw-r--r-- | templates/master.cf.debian-sid.erb | 25 |
1 files 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 |