summaryrefslogtreecommitdiff
path: root/puppet/modules/site_postfix
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-24 22:51:04 +0200
committervarac <varacanero@zeromail.org>2013-09-24 22:51:04 +0200
commitc171b05d95aa814872b216b1c119db7eeb805809 (patch)
tree7a5419163127f98f4108415453f21af617bad222 /puppet/modules/site_postfix
parent372c2f96997f90ae9bfd6c3315e7244ce851c460 (diff)
parent2aa2ab27860166b2846abbfd4ed2afc76576f714 (diff)
Merge branch 'feature/3917_openvpn_is_failing_to_connect' into develop
Diffstat (limited to 'puppet/modules/site_postfix')
-rw-r--r--puppet/modules/site_postfix/manifests/mx.pp6
-rw-r--r--puppet/modules/site_postfix/manifests/mx/smtp_auth.pp4
2 files changed, 4 insertions, 6 deletions
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 =>
}
}