aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2010-12-09 12:34:18 +0000
committerMichael Scherer <misc@mageia.org>2010-12-09 12:34:18 +0000
commitd6c7dc6ec5bfa5ab71b41d46fa1e746230cae131 (patch)
tree52dc8fc1eeac46bae09dd7b0bc178adc534692e8
parentb1cba1f575fc403885a8e4e9fed199c6bb528efe (diff)
downloadpuppet-d6c7dc6ec5bfa5ab71b41d46fa1e746230cae131.tar
puppet-d6c7dc6ec5bfa5ab71b41d46fa1e746230cae131.tar.gz
puppet-d6c7dc6ec5bfa5ab71b41d46fa1e746230cae131.tar.bz2
puppet-d6c7dc6ec5bfa5ab71b41d46fa1e746230cae131.tar.xz
puppet-d6c7dc6ec5bfa5ab71b41d46fa1e746230cae131.zip
the sympa class was renamed, so we need to adjust the tag here
-rw-r--r--modules/postfix/templates/main.cf4
-rw-r--r--modules/postfix/templates/primary_master.cf2
-rw-r--r--modules/postfix/templates/transport_regexp2
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/postfix/templates/main.cf b/modules/postfix/templates/main.cf
index e5e13940..0699c95e 100644
--- a/modules/postfix/templates/main.cf
+++ b/modules/postfix/templates/main.cf
@@ -39,7 +39,7 @@ relay_domains = <%= domain %>, ml.<%= domain %>
mydestination = <%= fqdn %>
<%- if all_tags.include?('postfix::primary_smtp') -%>
<%= domain %>,
-<%- if classes.include?('sympa') -%>
+<%- if classes.include?('sympa::server') -%>
ml.<%= domain %>
<%- end -%>
@@ -55,7 +55,7 @@ transport_maps = regexp:/etc/postfix/transport_regexp
content_filter = smtp-filter:[127.0.0.1]:10025
<%- end -%>
-<%- if classes.include?('sympa') -%>
+<%- if classes.include?('sympa::server') -%>
sympa_destination_recipient_limit = 1
sympabounce_destination_recipient_limit = 1
<%- end -%>
diff --git a/modules/postfix/templates/primary_master.cf b/modules/postfix/templates/primary_master.cf
index 299bbd6c..8037d037 100644
--- a/modules/postfix/templates/primary_master.cf
+++ b/modules/postfix/templates/primary_master.cf
@@ -116,7 +116,7 @@ cyrus-inet unix - - y - - lmtp
#mailman unix - n n - - pipe
# flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
# ${nexthop} ${user}
-<% if classes.include?('sympa') %>
+<% if classes.include?('sympa::server') %>
sympa unix - n n - - pipe
flags=R user=sympa argv=/usr/sbin/queue ${recipient}
sympabounce unix - n n - - pipe
diff --git a/modules/postfix/templates/transport_regexp b/modules/postfix/templates/transport_regexp
index 5d005c7b..7d80cf9f 100644
--- a/modules/postfix/templates/transport_regexp
+++ b/modules/postfix/templates/transport_regexp
@@ -1,7 +1,7 @@
<%
ml_domain = 'ml\.' + domain.gsub('.','\.')
%>
-<%- if classes.include?('sympa') -%>
+<%- if classes.include?('sympa::server') -%>
/^.*+owner\@<%= ml_domain %>$/ sympabounce:
/^.*\@<%= ml_domain %>$/ sympa:
<%- end -%>