summaryrefslogtreecommitdiff
path: root/puppet/modules/site_postfix/manifests/mx.pp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-03 15:26:23 +0200
committervarac <varacanero@zeromail.org>2013-09-03 18:41:58 +0200
commitd901c602f61697f329e37bc92209c264755094c1 (patch)
tree67955cf852a784bc02c812ad9d4e2e3978c10aa6 /puppet/modules/site_postfix/manifests/mx.pp
parentb25d10864798e50dd51b9404903d3c493b44a65e (diff)
Sending mail fails when relaying using non-fully-qualified hostname (Feature #3667)
Diffstat (limited to 'puppet/modules/site_postfix/manifests/mx.pp')
-rw-r--r--puppet/modules/site_postfix/manifests/mx.pp7
1 files changed, 4 insertions, 3 deletions
diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp
index e5dc1c7b..515b6825 100644
--- a/puppet/modules/site_postfix/manifests/mx.pp
+++ b/puppet/modules/site_postfix/manifests/mx.pp
@@ -42,8 +42,9 @@ class site_postfix::mx {
-o smtpd_tls_security_level=encrypt\n
submission inet n - n - - smtpd\n
-o smtpd_tls_security_level=encrypt\n
- -o smtpd_recipient_restrictions=\$submission_recipient_restrictions",
- require => [ X509::Key[$cert_name], X509::Cert[$cert_name],
- User['vmail'] ]
+ -o smtpd_recipient_restrictions=\$submission_recipient_restrictions\n
+ -o smtpd_helo_restrictions=\$submission_helo_restrictions",
+ require =>
+ [ X509::Key[$cert_name], X509::Cert[$cert_name], User['vmail'] ]
}
}