aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2017-04-21 21:17:26 +0100
committerPascal Terjan <pterjan@mageia.org>2017-04-21 21:17:26 +0100
commitf846a18027e157e5108e15846a72b56acbd7e6b7 (patch)
treecb322ce51f3b281f0ece3dfd67ba1ac02a4ece25
parente3ef63d6115031994f0abc3ae7cb854595030ce1 (diff)
downloadpuppet-f846a18027e157e5108e15846a72b56acbd7e6b7.tar
puppet-f846a18027e157e5108e15846a72b56acbd7e6b7.tar.gz
puppet-f846a18027e157e5108e15846a72b56acbd7e6b7.tar.bz2
puppet-f846a18027e157e5108e15846a72b56acbd7e6b7.tar.xz
puppet-f846a18027e157e5108e15846a72b56acbd7e6b7.zip
Try to get alamut to forward ML email to sucuk
-rw-r--r--modules/postfix/templates/main.cf2
-rw-r--r--modules/postfix/templates/transport_regexp2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/postfix/templates/main.cf b/modules/postfix/templates/main.cf
index acdc7bb4..0b706ac8 100644
--- a/modules/postfix/templates/main.cf
+++ b/modules/postfix/templates/main.cf
@@ -41,9 +41,7 @@ relay_domains = <%= domain %>,
<%- end -%>
mydestination = <%= fqdn %>
-<%- if classes.include?('sympa::server') -%>
ml.<%= domain %>
-<%- end -%>
<%- if all_tags.include?('postfix::server::primary') -%>
diff --git a/modules/postfix/templates/transport_regexp b/modules/postfix/templates/transport_regexp
index d6c485f1..2db09d95 100644
--- a/modules/postfix/templates/transport_regexp
+++ b/modules/postfix/templates/transport_regexp
@@ -4,4 +4,6 @@ ml_domain = 'ml\.' + domain.gsub('.','\.')
<%- if classes.include?('sympa::server') -%>
/^.*+owner\@<%= ml_domain %>$/ sympabounce:
/^.*\@<%= ml_domain %>$/ sympa:
+<%- else -%>
+/^.*\@<%= ml_domain %>$/ smtp:sucuk.mageia.org
<%- end -%>