Disable munin by default at nodo::subsystem::mail

diff --git a/manifests/subsystem/mail.pp b/manifests/subsystem/mail.pp
index b68879482551f546859542f941ddd5997f9235af..271a977c11328377a6420f647a6f4f047723383e 100644 (file)
--- a/manifests/subsystem/mail.pp
+++ b/manifests/subsystem/mail.pp
@@ -1,7 +1,7 @@
 class nodo::subsystem::mail {
   # Email delivery configuration
   $mail_delivery = hiera('nodo::subsystem::mail::delivery', 'exim')
-  $munin         = hiera('nodo::host::use_munin', True)
+  $munin         = hiera('nodo::host::use_munin', false)
 
   case $mail_delivery {
     'tunnel': {

diff --git a/manifests/subsystem/ups.pp b/manifests/subsystem/ups.pp
index 5fa57aba765a85a9b6e0b962174e210e99f2fda7..987aadfc7675e1ef8b665ddca3692f043636f67f 100644 (file)
--- a/manifests/subsystem/ups.pp
+++ b/manifests/subsystem/ups.pp
@@ -9,7 +9,6 @@ class nodo::subsystem::ups(
     $onbatterydelay = hiera('nodo::subsystem::ups::onbatterydelay', '6'),
     $batterylevel   = hiera('nodo::subsystem::ups::batterylevel',   '5'),
     $minutes        = hiera('nodo::subsystem::ups::minutes',        '3'),
-    $munin          = hiera('nodo::subsystem::ups::munin',          false)
 ) {
   case $include {
     true: {