diff options
| author | varac <varacanero@zeromail.org> | 2013-09-24 18:02:05 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-09-24 21:03:51 +0200 |
| commit | 1adbf7af76b10d44a53de28d23f4c7167dc4f941 (patch) | |
| tree | adf6bff7ea70d7f1454e26e265eb26b92e4432a1 /puppet | |
| parent | 0447e92ab5dcc3d8a07613a765c60db23252f278 (diff) | |
fix client_ca cert+key for mx service (Feature #3921)
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/modules/site_mx/manifests/init.pp | 3 | ||||
| -rw-r--r-- | puppet/modules/site_postfix/manifests/mx.pp | 6 | ||||
| -rw-r--r-- | puppet/modules/site_postfix/manifests/mx/smtp_auth.pp | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/puppet/modules/site_mx/manifests/init.pp b/puppet/modules/site_mx/manifests/init.pp index 52c5f1d6..cdb84b54 100644 --- a/puppet/modules/site_mx/manifests/init.pp +++ b/puppet/modules/site_mx/manifests/init.pp @@ -5,7 +5,8 @@ class site_mx { include site_config::x509::cert include site_config::x509::key include site_config::x509::ca - include site_config::x509::client_ca + include site_config::x509::client_ca::ca + include site_config::x509::client_ca::key include site_postfix::mx diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp index d56b526f..abc0ab46 100644 --- a/puppet/modules/site_postfix/manifests/mx.pp +++ b/puppet/modules/site_postfix/manifests/mx.pp @@ -10,7 +10,8 @@ class site_postfix::mx { include site_config::x509::cert include site_config::x509::key - include site_config::x509::client_ca + include site_config::x509::client_ca::ca + include site_config::x509::client_ca::key postfix::config { 'mydestination': @@ -51,7 +52,8 @@ submission inet n - n - - smtpd require => [ Class['Site_config::X509::Key'], Class['Site_config::X509::Cert'], - Class['Site_config::X509::Client_ca'], + Class['Site_config::X509::Client_ca::Key'], + Class['Site_config::X509::Client_ca::Ca'], User['vmail'] ] } } diff --git a/puppet/modules/site_postfix/manifests/mx/smtp_auth.pp b/puppet/modules/site_postfix/manifests/mx/smtp_auth.pp index ab75130e..afa70527 100644 --- a/puppet/modules/site_postfix/manifests/mx/smtp_auth.pp +++ b/puppet/modules/site_postfix/manifests/mx/smtp_auth.pp @@ -1,10 +1,6 @@ class site_postfix::mx::smtp_auth { - $x509 = hiera('x509') postfix::config { - 'smtpd_tls_cert_file': value => $x509['client_ca_cert']; - 'smtpd_tls_key_file': value => $x509['client_ca_key']; 'smtpd_tls_ask_ccert': value => 'yes'; - #'smtpd_tls_CAfile': value => } } |