summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-08-04 21:14:38 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-08-04 21:14:38 -0300
commitf5f4484999cb792fe6a82fe59f804ae580806580 (patch)
tree57abf8514aba9f30031a97b5ba7466ed596d7840 /manifests
parente9770f6f6f7841b693cb09efe659754d56b90fd4 (diff)
downloadpuppet-mail-f5f4484999cb792fe6a82fe59f804ae580806580.tar.gz
puppet-mail-f5f4484999cb792fe6a82fe59f804ae580806580.tar.bz2
Do not enable gpg_mailgate by default
Diffstat (limited to 'manifests')
-rw-r--r--manifests/system.pp5
1 files changed, 4 insertions, 1 deletions
diff --git a/manifests/system.pp b/manifests/system.pp
index 5323fc6..480d451 100644
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -15,7 +15,10 @@ class mail::system(
use_sympa => "yes",
use_mlmmj => "yes",
use_firma => "yes",
- use_gpg_mailgate => "yes",
+ use_gpg_mailgate => hiera('mail::firma', false) ? {
+ true => "yes",
+ default => "no",
+ },
use_submission => "yes",
use_smtps => "no",
anon_sasl => "yes",