aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-02-15 02:51:37 +0000
committerMichael Scherer <misc@mageia.org>2011-02-15 02:51:37 +0000
commit99c22b759949c49568add3e368a57bc663418439 (patch)
tree7846aa806506ff0b664b34db4c2d095741bdf420 /modules
parentee0e5b29a686b3ac1afff39f0e21f040750a1335 (diff)
downloadpuppet-99c22b759949c49568add3e368a57bc663418439.tar
puppet-99c22b759949c49568add3e368a57bc663418439.tar.gz
puppet-99c22b759949c49568add3e368a57bc663418439.tar.bz2
puppet-99c22b759949c49568add3e368a57bc663418439.tar.xz
puppet-99c22b759949c49568add3e368a57bc663418439.zip
- reenable the main domain as the problem is fixed.
mail is now routed properly, as I had to disable the local transport map to enable the fallback one, who enable to route everything we want where we want
Diffstat (limited to 'modules')
-rw-r--r--modules/postfix/templates/main.cf14
1 files changed, 10 insertions, 4 deletions
diff --git a/modules/postfix/templates/main.cf b/modules/postfix/templates/main.cf
index c6d7d552..334fcf43 100644
--- a/modules/postfix/templates/main.cf
+++ b/modules/postfix/templates/main.cf
@@ -38,10 +38,16 @@ relay_domains = <%= domain %>, ml.<%= domain %>
mydestination = <%= fqdn %>
<%- if all_tags.include?('postfix::primary_smtp') -%>
-# disabled as this prevent bugzilla from sending mail to
-# zarb.org ml. I will reenable it once I find how to properly
-# route everything
- #<%= domain %>,
+ <%= domain %>,
+
+# local_recipient_maps is disabled, as we need to route all
+# non local email to ryu as long as mageia ml are hosted
+# there. Hence the use of fallback_transport , but this is
+# taken in account only of local_recipient_maps is empty
+local_recipient_maps =
+# route ml to ryu ( ml being mageia-*@mageia )
+fallback_transport = regexp:/etc/postfix/transport_regexp
+
alias_maps = hash:/etc/postfix/aliases
# uncomment if we want to enable ldap based alias