summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-03 16:20:02 +0200
committervarac <varacanero@zeromail.org>2013-09-03 18:41:58 +0200
commit1c0bde0eef6f693a3a67b88eed40173d9f4cf756 (patch)
tree47c53dad003c9ba0d177acb2038e6dee7983a416 /puppet/modules
parentd901c602f61697f329e37bc92209c264755094c1 (diff)
fix $master_cf_tail format
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_postfix/manifests/mx.pp18
1 files changed, 9 insertions, 9 deletions
diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp
index 515b6825..2d8f3db5 100644
--- a/puppet/modules/site_postfix/manifests/mx.pp
+++ b/puppet/modules/site_postfix/manifests/mx.pp
@@ -37,14 +37,14 @@ class site_postfix::mx {
root_mail_recipient => $root_mail_recipient,
smtp_listen => 'all',
mastercf_tail =>
- "smtps inet n - - - - smtpd\n
- -o smtpd_tls_wrappermode=yes\n
- -o smtpd_tls_security_level=encrypt\n
- submission inet n - n - - smtpd\n
- -o smtpd_tls_security_level=encrypt\n
- -o smtpd_recipient_restrictions=\$submission_recipient_restrictions\n
- -o smtpd_helo_restrictions=\$submission_helo_restrictions",
- require =>
- [ X509::Key[$cert_name], X509::Cert[$cert_name], User['vmail'] ]
+ "smtps inet n - - - - smtpd
+ -o smtpd_tls_wrappermode=yes
+ -o smtpd_tls_security_level=encrypt
+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 => [
+ X509::Key[$cert_name], X509::Cert[$cert_name], User['vmail'] ]
}
}