From fee571ccc4cd0cf8c665cf7446a0bb99c6dd30cf Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Wed, 27 Nov 2013 13:10:01 -0500
Subject: 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
---
 puppet/modules/site_postfix/manifests/mx.pp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'puppet/modules/site_postfix/manifests/mx.pp')

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'],
-- 
cgit v1.2.3