diff options
| author | varac <varacanero@zeromail.org> | 2013-09-19 12:19:00 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-09-19 12:19:00 +0200 |
| commit | 1ce6cb5a30c5ee73d6474ac9c1bbd4c7819d9a73 (patch) | |
| tree | ce7d548ec62a5d8107433318413a1e2de361c9c8 /puppet/modules/site_postfix | |
| parent | e182d12c72743491805a3873e8b6cd804fe5394c (diff) | |
only deploy x509 stuff for nodes if it existes in hiera (Feature #3875)
Diffstat (limited to 'puppet/modules/site_postfix')
| -rw-r--r-- | puppet/modules/site_postfix/manifests/mx.pp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp index 4a7d66ed..32465e01 100644 --- a/puppet/modules/site_postfix/manifests/mx.pp +++ b/puppet/modules/site_postfix/manifests/mx.pp @@ -8,6 +8,9 @@ class site_postfix::mx { $root_mail_recipient = $mx_hash['contact'] $postfix_smtp_listen = 'all' + include site_config::x509::cert_key + include site_config::x509::client_ca + postfix::config { 'mydestination': value => "\$myorigin, localhost, localhost.\$mydomain, ${domain}"; @@ -44,6 +47,9 @@ 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 => Class['Site_config::X509'] + require => [ + Class['Site_config::X509::Cert_key'], + Class['Site_config::X509::Client_ca'], + User['vmail'] ] } } |