From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 13 Sep 2013 21:10:30 +0000 (-0300)
Subject: Do not use mlmmj_relay_domains anymore
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=8970332a11e315cc3e3d9ffe6ceebcf7711d4059;p=puppet-mail.git

Do not use mlmmj_relay_domains anymore
---

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