From: intrigeri <intrigeri@boum.org>
Date: Sat, 21 Jan 2017 12:05:27 +0000 (+0000)
Subject: Merge remote-tracking branch 'shared/master' into bugfix/gitlab-3-resync-sid-template
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=4fa3f543ed36029f4500c44217bbcf96d744c5f6;p=puppet-postfix.git

Merge remote-tracking branch 'shared/master' into bugfix/gitlab-3-resync-sid-template
---

4fa3f543ed36029f4500c44217bbcf96d744c5f6
diff --cc templates/master.cf.debian-sid.erb
index 943581d,7b653fb..397c089
--- a/templates/master.cf.debian-sid.erb
+++ b/templates/master.cf.debian-sid.erb
@@@ -15,35 -14,23 +15,35 @@@
  #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 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
+ <% 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