aboutsummaryrefslogtreecommitdiff
path: root/manifests/subsystem
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-05 16:32:08 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-05 16:32:08 -0300
commit4ac9cc3ee59315d976e5dac47bf5efa251a1fd9a (patch)
treeb311e80764f6badda6d82ac8d36cc3bc3d55e27b /manifests/subsystem
parent4494d7e756686e57560d619e6338211726f13c17 (diff)
downloadpuppet-nodo-4ac9cc3ee59315d976e5dac47bf5efa251a1fd9a.tar.gz
puppet-nodo-4ac9cc3ee59315d976e5dac47bf5efa251a1fd9a.tar.bz2
Disable munin by default at nodo::subsystem::mail
Diffstat (limited to 'manifests/subsystem')
-rw-r--r--manifests/subsystem/mail.pp2
-rw-r--r--manifests/subsystem/ups.pp1
2 files changed, 1 insertions, 2 deletions
diff --git a/manifests/subsystem/mail.pp b/manifests/subsystem/mail.pp
index b688794..271a977 100644
--- 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 5fa57ab..987aadf 100644
--- 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: {