summaryrefslogtreecommitdiff
path: root/puppet/modules/site_postfix/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-04-18 15:23:28 +0200
committervarac <varacanero@zeromail.org>2017-02-23 10:56:21 +0100
commit03235f93f32edf225128d24325b486531138e486 (patch)
tree5cec2bf9709d39d96c8f6d37d64bf24a6371fe87 /puppet/modules/site_postfix/manifests
parente982bbf4d35529e59fbff386284d5478c7f5eb66 (diff)
[feat] always set smtpd_relay_restrictions
now that we deprecate wheezy, we can always set smtpd_relay_restrictions
Diffstat (limited to 'puppet/modules/site_postfix/manifests')
-rw-r--r--puppet/modules/site_postfix/manifests/mx.pp12
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