summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-08-28 12:18:16 +0200
committervarac <varacanero@zeromail.org>2013-08-28 12:29:13 +0200
commit4bcf6fbba365097286c9a411436d2d6b686336c0 (patch)
tree6a40dd8fcaf254b2bb8f69cb6058ab8e5108b930 /puppet/modules
parent231f6a03a93caa914bc04d40af2cb203ded676fb (diff)
integrate manual postfix config changes in puppet (Feature #3538)
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_postfix/manifests/mx.pp1
-rw-r--r--puppet/modules/site_postfix/manifests/mx/tls.pp2
2 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 d7637c70..7e2082d9 100644
--- a/puppet/modules/site_postfix/manifests/mx.pp
+++ b/puppet/modules/site_postfix/manifests/mx.pp
@@ -17,7 +17,6 @@ class site_postfix::mx {
'home_mailbox': value => 'Maildir/';
'virtual_alias_maps': value => 'tcp:localhost:4242';
'luser_relay': value => 'vmail';
- 'local_recipient_maps': value => '';
}
include site_postfix::mx::smtpd_checks
diff --git a/puppet/modules/site_postfix/manifests/mx/tls.pp b/puppet/modules/site_postfix/manifests/mx/tls.pp
index 4b7a2626..8c9da9db 100644
--- a/puppet/modules/site_postfix/manifests/mx/tls.pp
+++ b/puppet/modules/site_postfix/manifests/mx/tls.pp
@@ -23,7 +23,7 @@ class site_postfix::mx::tls {
'smtpd_tls_CAfile': value => $client_ca;
'smtpd_tls_cert_file': value => $cert_path;
'smtpd_tls_key_file': value => $key_path;
- 'smtpd_tls_req_ccert': value => 'yes';
+ 'smtpd_tls_ask_ccert': value => 'yes';
'smtpd_tls_security_level':
value => 'may';
}