summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-09-13 18:10:30 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-09-13 18:10:30 -0300
commit8970332a11e315cc3e3d9ffe6ceebcf7711d4059 (patch)
tree8fc10e3ad4f9b73ff40f43349f22fb9f1b8e531d /manifests
parent4c6ee8b78d84cddf398fbc0650b7cf5e7fc23861 (diff)
downloadpuppet-mail-8970332a11e315cc3e3d9ffe6ceebcf7711d4059.tar.gz
puppet-mail-8970332a11e315cc3e3d9ffe6ceebcf7711d4059.tar.bz2
Do not use mlmmj_relay_domains anymore
Diffstat (limited to 'manifests')
-rw-r--r--manifests/system.pp6
1 files changed, 4 insertions, 2 deletions
diff --git a/manifests/system.pp b/manifests/system.pp
index 8461ebd..5487ed3 100644
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -94,7 +94,9 @@ class mail::system(
case hiera('mail::mlmmj', false) {
true: {
class { 'mail::mlmmj': }
- $mlmmj_relay_domains = ", ${mail::mlmmj::subdomain}.${domain}"
+
+ # Since we're using transport_regexps, we dont need this anymore
+ #$mlmmj_relay_domains = ", ${mail::mlmmj::subdomain}.${domain}"
}
}
@@ -114,7 +116,7 @@ class mail::system(
}
case $relay_domains {
- '': { $real_relay_domains = "${mydestination}${sympa_relay_domains}${schleuder_relay_domains}${mlmmj_relay_domains}${firma_relay_domains}" }
+ '': { $real_relay_domains = "${mydestination}${sympa_relay_domains}${schleuder_relay_domains}${firma_relay_domains}" }
}
# Include base configuration