aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2017-04-20 22:15:25 +0100
committerPascal Terjan <pterjan@mageia.org>2017-04-20 22:15:25 +0100
commit5c24b3d16d95aa3d2d522637f7ccd24eb9799507 (patch)
tree3034baed316dff7886ac9c7cd9e31da883fbf198
parent414761e34e22f3db25a2cd6abbeb0a74c0211c7e (diff)
downloadpuppet-5c24b3d16d95aa3d2d522637f7ccd24eb9799507.tar
puppet-5c24b3d16d95aa3d2d522637f7ccd24eb9799507.tar.gz
puppet-5c24b3d16d95aa3d2d522637f7ccd24eb9799507.tar.bz2
puppet-5c24b3d16d95aa3d2d522637f7ccd24eb9799507.tar.xz
puppet-5c24b3d16d95aa3d2d522637f7ccd24eb9799507.zip
Try adding a few missing postfix parts
-rw-r--r--modules/postfix/templates/simple_relay_main.cf4
-rw-r--r--modules/sympa/manifests/server.pp2
2 files changed, 6 insertions, 0 deletions
diff --git a/modules/postfix/templates/simple_relay_main.cf b/modules/postfix/templates/simple_relay_main.cf
index e5b3096d..e05c49ba 100644
--- a/modules/postfix/templates/simple_relay_main.cf
+++ b/modules/postfix/templates/simple_relay_main.cf
@@ -35,3 +35,7 @@ smtpd_tls_cert_file = /etc/pki/tls/certs/postfix.pem
smtpd_tls_key_file = /etc/pki/tls/private/postfix.pem
smtpd_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt
relayhost = <%= domain %>
+
+<%- if classes.include?('sympa::server') -%>
+mydestination = ml.<%= domain %>
+<%- end -%>
diff --git a/modules/sympa/manifests/server.pp b/modules/sympa/manifests/server.pp
index 429c5ae4..70ccd85c 100644
--- a/modules/sympa/manifests/server.pp
+++ b/modules/sympa/manifests/server.pp
@@ -100,5 +100,7 @@ class sympa::server(
content => template('postfix/primary_master.cf');
'/etc/postfix/sympa_aliases':
content => template('postfix/sympa_aliases');
+ '/etc/postfix/transport_regexp':
+ content => template('postfix/transport_regexp');
}
}