From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 5 Aug 2013 00:23:41 +0000 (-0300)
Subject: Do not include schleuder, sumpa, firma and mlmmj by default on master.cf
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=8f15575afa098dffe6b1e44f86e31384a417f7d4;p=puppet-mail.git

Do not include schleuder, sumpa, firma and mlmmj by default on master.cf
---

diff --git a/manifests/system.pp b/manifests/system.pp
index 4a47420..8461ebd 100644
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -11,10 +11,22 @@ class mail::system(
     smtp_listen             => "all",
     use_amavisd             => "yes",
     use_dovecot_lda         => "yes",
-    use_schleuder           => "yes",
-    use_sympa               => "yes",
-    use_mlmmj               => "yes",
-    use_firma               => "yes",
+    use_schleuder           => hiera('mail::schleuder', false) ? {
+      true    => "yes",
+      default => "no",
+    },
+    use_sympa               => hiera('mail::sympa', false) ? {
+      true    => "yes",
+      default => "no",
+    },
+    use_mlmmj               => hiera('mail::mlmmj', false) ? {
+      true    => "yes",
+      default => "no",
+    },
+    use_firma               => hiera('mail::firma', false) ? {
+      true    => "yes",
+      default => "no",
+    },
     use_gpg_mailgate        => hiera('mail::gpg_mailgate', false) ? {
       true    => "yes",
       default => "no",