diff options
| author | Micah <micah@riseup.net> | 2017-01-23 21:11:31 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2017-01-23 21:11:31 +0000 |
| commit | cc0baada0d31c2732cd8c1e69abd4fdd73ae3e1c (patch) | |
| tree | 6ec6893267818b757d97f2668209ba0a8328c4b1 /templates/master.cf.debian-sid.erb | |
| parent | 969076a813b88dafd222c413bf6fbabab837eafb (diff) | |
| parent | 8594fa820c5310cd8f159bd7cdcee20f1b201ef9 (diff) | |
Merge branch 'bugfix/gitlab-3-resync-sid-template' into 'master'
Resync sid template
Closes #3
See merge request !7
Diffstat (limited to 'templates/master.cf.debian-sid.erb')
| -rw-r--r-- | templates/master.cf.debian-sid.erb | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/templates/master.cf.debian-sid.erb b/templates/master.cf.debian-sid.erb index 7b653fb..397c089 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 |