diff options
| author | Micah Anderson <micah@riseup.net> | 2017-11-28 11:35:01 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2017-11-28 11:35:01 -0500 |
| commit | 0d251e2ceddd3e02ed8bba8725830689dbdd1397 (patch) | |
| tree | 37d7096d9e458ca1e6431dff8a2f571553011c44 /puppet/modules/site_postfix | |
| parent | 93a181d44e2d8163ae44945aac1b6477e268170d (diff) | |
| parent | bf6c56d86c7ba45e7ca766d990a9e9162025e5ac (diff) | |
Merge tag 'refs/tags/0.10.0' into stable
Release 0.10.0
Diffstat (limited to 'puppet/modules/site_postfix')
| -rw-r--r-- | puppet/modules/site_postfix/manifests/mx.pp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp index 2dac85f5..e94320c9 100644 --- a/puppet/modules/site_postfix/manifests/mx.pp +++ b/puppet/modules/site_postfix/manifests/mx.pp @@ -140,21 +140,13 @@ class site_postfix::mx { # greater verbosity for debugging, take out for production #include site_postfix::debug - case $::operatingsystemrelease { - /^7.*/: { - $smtpd_relay_restrictions='' - } - default: { - $smtpd_relay_restrictions=" -o smtpd_relay_restrictions=\$smtps_relay_restrictions\n" - } - } - $mastercf_tail = " smtps inet n - - - - smtpd -o smtpd_tls_wrappermode=yes -o smtpd_tls_security_level=encrypt -o tls_preempt_cipherlist=yes -${smtpd_relay_restrictions} -o smtpd_recipient_restrictions=\$smtps_recipient_restrictions + -o smtpd_relay_restrictions=\$smtps_relay_restrictions + -o smtpd_recipient_restrictions=\$smtps_recipient_restrictions -o smtpd_helo_restrictions=\$smtps_helo_restrictions -o smtpd_client_restrictions= -o cleanup_service_name=clean_smtps |