diff options
| author | Micah Anderson <micah@leap.se> | 2013-08-29 16:19:46 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2013-08-29 16:19:46 -0400 |
| commit | 37ac5a7a86796c6579f4b6b00ed0ecb5d8cd8370 (patch) | |
| tree | 5ceffc64aa9adc8d0b28667c5d6e2f28a10e063c /puppet | |
| parent | 40a4e7a9e939bbf5a8cd550dd6e64c029eb83273 (diff) | |
| parent | ddcab83dda101ee335bbf37451f37e2bfe358c7f (diff) | |
Merge branch 'feature/3604' into develop
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/modules/site_postfix/manifests/mx.pp | 1 | ||||
| -rw-r--r-- | puppet/modules/site_shorewall/manifests/mx.pp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp index ed5b3832..18815f70 100644 --- a/puppet/modules/site_postfix/manifests/mx.pp +++ b/puppet/modules/site_postfix/manifests/mx.pp @@ -35,6 +35,7 @@ class site_postfix::mx { preseed => true, root_mail_recipient => $root_mail_recipient, smtp_listen => 'all', + mastercf_tail => "smtps inet n - - - - smtpd\n -o smtpd_tls_wrappermode=yes\n -o smtpd_tls_security_level=encrypt\n", require => [ X509::Key[$cert_name], X509::Cert[$cert_name], User['vmail'] ] } diff --git a/puppet/modules/site_shorewall/manifests/mx.pp b/puppet/modules/site_shorewall/manifests/mx.pp index 5ec95fdd..123ffec2 100644 --- a/puppet/modules/site_shorewall/manifests/mx.pp +++ b/puppet/modules/site_shorewall/manifests/mx.pp @@ -2,7 +2,7 @@ class site_shorewall::mx { include site_shorewall::defaults - $smtpd_ports = '25' + $smtpd_ports = '25,465' # define macro for incoming services file { '/etc/shorewall/macro.leap_mx': |