summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-09-13 18:25:23 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-09-13 18:25:23 -0300
commit80f47b9c7164991e471fba1e01000cf002562d31 (patch)
tree0fdf89d6d398d80a87ff364cc75955c529e82cd6
parent8970332a11e315cc3e3d9ffe6ceebcf7711d4059 (diff)
downloadpuppet-mail-80f47b9c7164991e471fba1e01000cf002562d31.tar.gz
puppet-mail-80f47b9c7164991e471fba1e01000cf002562d31.tar.bz2
Rollback
-rw-r--r--manifests/system.pp5
1 files changed, 2 insertions, 3 deletions
diff --git a/manifests/system.pp b/manifests/system.pp
index 5487ed3..89f50c6 100644
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -95,8 +95,7 @@ class mail::system(
true: {
class { 'mail::mlmmj': }
- # Since we're using transport_regexps, we dont need this anymore
- #$mlmmj_relay_domains = ", ${mail::mlmmj::subdomain}.${domain}"
+ $mlmmj_relay_domains = ", ${mail::mlmmj::subdomain}.${domain}"
}
}
@@ -116,7 +115,7 @@ class mail::system(
}
case $relay_domains {
- '': { $real_relay_domains = "${mydestination}${sympa_relay_domains}${schleuder_relay_domains}${firma_relay_domains}" }
+ '': { $real_relay_domains = "${mydestination}${sympa_relay_domains}${schleuder_relay_domains}${mlmmj_relay_domains}${firma_relay_domains}" }
}
# Include base configuration