diff options
| author | varac <varacanero@zeromail.org> | 2013-09-24 09:09:30 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-09-24 09:20:42 +0200 |
| commit | ffa4504f81c0abecc62b068951ec147741028128 (patch) | |
| tree | 960a6b7c0e40457c124463fab85acca2e2d16b19 /puppet/modules/site_postfix | |
| parent | d8b9ab39d333de6494e5006b3ba4abf4b8901bca (diff) | |
seperate cert and key deployment (#3918)
Diffstat (limited to 'puppet/modules/site_postfix')
| -rw-r--r-- | puppet/modules/site_postfix/manifests/mx.pp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp index 32465e01..d56b526f 100644 --- a/puppet/modules/site_postfix/manifests/mx.pp +++ b/puppet/modules/site_postfix/manifests/mx.pp @@ -8,7 +8,8 @@ class site_postfix::mx { $root_mail_recipient = $mx_hash['contact'] $postfix_smtp_listen = 'all' - include site_config::x509::cert_key + include site_config::x509::cert + include site_config::x509::key include site_config::x509::client_ca postfix::config { @@ -48,7 +49,8 @@ submission inet n - n - - smtpd -o smtpd_recipient_restrictions=\$submission_recipient_restrictions -o smtpd_helo_restrictions=\$submission_helo_restrictions", require => [ - Class['Site_config::X509::Cert_key'], + Class['Site_config::X509::Key'], + Class['Site_config::X509::Cert'], Class['Site_config::X509::Client_ca'], User['vmail'] ] } |