diff options
| author | Micah Anderson <micah@leap.se> | 2013-11-27 13:10:01 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2013-11-27 13:10:01 -0500 |
| commit | fee571ccc4cd0cf8c665cf7446a0bb99c6dd30cf (patch) | |
| tree | 22c7d1c519e6d409fcb6ea88c292ca069a8b418b /puppet/modules/site_postfix/manifests/mx.pp | |
| parent | 82544d7ce6c1952fe9d1043facd64c4737b5f4f3 (diff) | |
disable starttls over submission for client connections, we are using TLS wrapper mode on the smtps port 465 now (#4366)
enable the missing smtpd_helo_restrictions for smtps
Change-Id: Iac497369d65c5ad8fd7e93e6fcabb830b855b4f6
Diffstat (limited to 'puppet/modules/site_postfix/manifests/mx.pp')
| -rw-r--r-- | puppet/modules/site_postfix/manifests/mx.pp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp index 474ed03d..59d3030d 100644 --- a/puppet/modules/site_postfix/manifests/mx.pp +++ b/puppet/modules/site_postfix/manifests/mx.pp @@ -55,10 +55,7 @@ class site_postfix::mx { -o smtpd_tls_wrappermode=yes -o smtpd_tls_security_level=encrypt -o smtpd_recipient_restrictions=\$smtps_recipient_restrictions -submission inet n - n - - smtpd - -o smtpd_tls_security_level=encrypt - -o smtpd_recipient_restrictions=\$submission_recipient_restrictions - -o smtpd_helo_restrictions=\$submission_helo_restrictions", + -o smtpd_helo_restrictions=\$smtps_helo_restrictions", require => [ Class['Site_config::X509::Key'], Class['Site_config::X509::Cert'], |