aboutsummaryrefslogtreecommitdiffstats
path: root/modules/postfix
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2012-03-22 20:18:20 +0000
committerPascal Terjan <pterjan@mageia.org>2012-03-22 20:18:20 +0000
commit92be72131ff8c871fcaa7a72360091790de273fb (patch)
tree726dadd1715c3a4b4b20294f4bb1f0504f07e501 /modules/postfix
parent61437a70323d4023a5eecac80be5060b6afa464b (diff)
downloadpuppet-92be72131ff8c871fcaa7a72360091790de273fb.tar
puppet-92be72131ff8c871fcaa7a72360091790de273fb.tar.gz
puppet-92be72131ff8c871fcaa7a72360091790de273fb.tar.bz2
puppet-92be72131ff8c871fcaa7a72360091790de273fb.tar.xz
puppet-92be72131ff8c871fcaa7a72360091790de273fb.zip
Update main.cf for new classes
Diffstat (limited to 'modules/postfix')
-rw-r--r--modules/postfix/templates/main.cf8
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/postfix/templates/main.cf b/modules/postfix/templates/main.cf
index fcedc936..bd3f276c 100644
--- a/modules/postfix/templates/main.cf
+++ b/modules/postfix/templates/main.cf
@@ -32,7 +32,7 @@ myhostname = <%= fqdn %>
mydomain = <%= domain %>
mydestination = <%= fqdn %>
myorigin = $mydomain
-<%- if all_tags.include?('postfix::secondary_smtp') -%>
+<%- if all_tags.include?('postfix::server::secondary') -%>
relay_domains = <%= domain %>,
ml.<%= domain %>,
group.<%= domain %>
@@ -43,7 +43,7 @@ mydestination = <%= fqdn %>
ml.<%= domain %>
<%- end -%>
-<%- if all_tags.include?('postfix::primary_smtp') -%>
+<%- if all_tags.include?('postfix::server::primary') -%>
virtual_mailbox_domains = <%= domain %>,
group.<%= domain %>
@@ -75,7 +75,7 @@ virtual_alias_maps = ldap:/etc/postfix/ldap_aliases.conf
<%- end -%>
-<%- if all_tags.include?('postfix::smtp_server') -%>
+<%- if all_tags.include?('postfix::server') -%>
transport_maps = regexp:/etc/postfix/transport_regexp
content_filter = smtp-filter:[127.0.0.1]:10025
<%- end -%>
@@ -97,7 +97,7 @@ smtpd_use_tls = no
#smtpd_tls_key_file = /etc/pki/tls/private/postfix.pem
#smtpd_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt
-<%- if all_tags.include?('postfix::smtp_server') -%>
+<%- if all_tags.include?('postfix::server') -%>
smtpd_etrn_restrictions = reject
smtpd_helo_required = yes