summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-08-04 21:23:41 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-08-04 21:23:41 -0300
commit8f15575afa098dffe6b1e44f86e31384a417f7d4 (patch)
tree3625e646fd1ced10c87adc5e9a7a5abdf9450ac3
parent5e6c6e39b0e399d15801003a110b917379284de1 (diff)
downloadpuppet-mail-8f15575afa098dffe6b1e44f86e31384a417f7d4.tar.gz
puppet-mail-8f15575afa098dffe6b1e44f86e31384a417f7d4.tar.bz2
Do not include schleuder, sumpa, firma and mlmmj by default on master.cf
-rw-r--r--manifests/system.pp20
1 files changed, 16 insertions, 4 deletions
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",