summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorroot <root@puppetmaster.black.co.at>2007-09-26 11:58:06 +0200
committerroot <root@puppetmaster.black.co.at>2007-09-26 11:58:06 +0200
commit69df2325d0ce4e6f40cac796839f7c953be75869 (patch)
treefa869ba0c3270207ada0c74eb0ffe73d807be2f2 /manifests
parent4f6eceb8ca88ce16c2966f4e617caedb0f11d047 (diff)
munin: re-add munin/nodes modules_dir and use $NODESDIR where appropriate
Diffstat (limited to 'manifests')
-rw-r--r--manifests/host.pp2
-rw-r--r--manifests/init.pp2
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/host.pp b/manifests/host.pp
index d790b4a..8a90cc2 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -9,7 +9,7 @@ class munin::host
File <<||>>
concatenated_file { "/etc/munin/munin.conf":
- dir => "/var/lib/puppet/modules/munin/nodes/",
+ dir => $NODESDIR,
header => "/etc/munin/munin.conf.header",
}
diff --git a/manifests/init.pp b/manifests/init.pp
index 613a18f..966cdcb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -7,7 +7,7 @@
# Define where the individual nodes' configs are stored
$NODESDIR="/var/lib/puppet/modules/munin/nodes"
-modules_dir { [ "munin", "munin/plugins" ]: }
+modules_dir { [ "munin", "munin/nodes", "munin/plugins" ]: }
import "host.pp"
import "client.pp"