diff options
author | varac <varacanero@zeromail.org> | 2013-09-19 11:51:43 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2013-09-19 11:51:43 +0200 |
commit | e2ea69580ff9417efb7a85e8190d331051323ff3 (patch) | |
tree | 3e67e75e932d683084863c5bae5981ed17c98964 /puppet/modules/site_postfix/manifests/mx.pp | |
parent | ca3f34da520ff835d383aa82f528adf927d3364f (diff) | |
parent | 1f9003eb6ed90400279011d477e6143e2eb6e2db (diff) |
Merge branch 'feature/3832_Unify_x509_certs,_keys_and_ca' into develop
Diffstat (limited to 'puppet/modules/site_postfix/manifests/mx.pp')
-rw-r--r-- | puppet/modules/site_postfix/manifests/mx.pp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp index 2d8f3db5..4a7d66ed 100644 --- a/puppet/modules/site_postfix/manifests/mx.pp +++ b/puppet/modules/site_postfix/manifests/mx.pp @@ -44,7 +44,6 @@ 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", - require => [ - X509::Key[$cert_name], X509::Cert[$cert_name], User['vmail'] ] + require => Class['Site_config::X509'] } } |