summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schmitt <david@schmitt.edv-bus.at>2009-06-03 11:38:08 +0200
committerDavid Schmitt <david@schmitt.edv-bus.at>2009-06-03 11:38:08 +0200
commit23dc1202b2e30355e1f45f7be882f65db8477053 (patch)
tree5815bda7cd7abce52cc7e09905ead169520414a6
parentc0abb341bfdd1061c85d0349b9a880de6047728f (diff)
Add initialisation for munin.conf.header
-rw-r--r--README3
-rw-r--r--manifests/host.pp12
2 files changed, 13 insertions, 2 deletions
diff --git a/README b/README
index 8352db0..80d0408 100644
--- a/README
+++ b/README
@@ -87,3 +87,6 @@ To use this module, follow these directions:
$munin_port = 4948
+4. Cleanup: If you need any manual configuration or had already nodes defined
+ in your munin.conf, you can add/remove them from
+ /etc/munin/munin.conf.header on the munin::host.
diff --git a/manifests/host.pp b/manifests/host.pp
index f89cbb8..1d17518 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -12,11 +12,19 @@ class munin::host
dir => $NODESDIR,
header => "/etc/munin/munin.conf.header",
}
+
+ file {
+ "/etc/munin/munin.conf.header":
+ source => "/etc/munin/munin.conf",
+ replace => no, # only initialise
+ mode => 0644, owner => root, group => 0,
+ before => File["/etc/munin/munin.conf"];
+ }
file { ["/var/log/munin-update.log", "/var/log/munin-limits.log",
"/var/log/munin-graph.log", "/var/log/munin-html.log"]:
- ensure => present,
- mode => 640, owner => munin, group => root;
+ ensure => present,
+ mode => 640, owner => munin, group => root;
}
}