From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 13 Sep 2013 21:25:23 +0000 (-0300)
Subject: Rollback
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=80f47b9c7164991e471fba1e01000cf002562d31;p=puppet-mail.git

Rollback
---

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