aboutsummaryrefslogtreecommitdiff
path: root/manifests/subsystem
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-03-11 15:57:13 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-03-11 15:57:13 -0300
commitc09f991dda8ed9024956ec659255d4b82d3b9804 (patch)
treed3f90f0a9429a8b25951618f558c50c843fd6661 /manifests/subsystem
parenta8ca37c1f4699fcf183dde41e4f6399c5fd7c20e (diff)
downloadpuppet-nodo-c09f991dda8ed9024956ec659255d4b82d3b9804.tar.gz
puppet-nodo-c09f991dda8ed9024956ec659255d4b82d3b9804.tar.bz2
Fix munin management when not on main master
Diffstat (limited to 'manifests/subsystem')
-rw-r--r--manifests/subsystem/monitor/master.pp10
1 files changed, 8 insertions, 2 deletions
diff --git a/manifests/subsystem/monitor/master.pp b/manifests/subsystem/monitor/master.pp
index 8263a2a..046143b 100644
--- a/manifests/subsystem/monitor/master.pp
+++ b/manifests/subsystem/monitor/master.pp
@@ -18,7 +18,10 @@ class nodo::subsystem::monitor::master {
ensure => $ensure,
path => "/var/lib/puppet/modules/munin/nodes/00-performance",
content => "max_graph_jobs 1\n max_cgi_graph_jobs 1\nfork no\n",
- require => Concatenated_file['/etc/munin/munin.conf'],
+ require => $main ? {
+ true => Concatenated_file['/etc/munin/munin.conf'],
+ default => undef,
+ },
}
#
@@ -48,7 +51,10 @@ class nodo::subsystem::monitor::master {
ensure => $ensure,
path => "/var/lib/puppet/modules/munin/nodes/00-rrdcache",
content => "rrdcached_socket /var/run/rrdcached.sock\n",
- require => Concatenated_file['/etc/munin/munin.conf'],
+ require => $main ? {
+ true => Concatenated_file['/etc/munin/munin.conf'],
+ default => undef,
+ },
}
if $main == true {