summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2009-12-10 16:08:30 -0500
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2009-12-10 16:08:30 -0500
commitab0c496979e18b6a2ef1a550e2385766c76f765e (patch)
tree7db5c87f458bfbd1a249eafbfa519032737f0f32 /manifests
parent76352415fec5c2ab6975e3a8843dd4983f7cae6a (diff)
adapt module_dir to new common module and create 'munin' base class to provide it, instead of doing an import
Diffstat (limited to 'manifests')
-rw-r--r--manifests/client.pp2
-rw-r--r--manifests/host.pp2
-rw-r--r--manifests/init.pp4
3 files changed, 5 insertions, 3 deletions
diff --git a/manifests/client.pp b/manifests/client.pp
index d033c28..24d84da 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -3,7 +3,7 @@
# See LICENSE for the full license granted to you.
# Adapted and improved by admin(at)immerda.ch
-class munin::client {
+class munin::client inherits munin {
$munin_port_real = $munin_port ? { '' => 4949, default => $munin_port }
$munin_host_real = $munin_host ? {
diff --git a/manifests/host.pp b/manifests/host.pp
index af78570..9fd637d 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -2,7 +2,7 @@
# Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
# See LICENSE for the full license granted to you.
-class munin::host
+class munin::host inherits munin
{
package {"munin": ensure => installed, }
diff --git a/manifests/init.pp b/manifests/init.pp
index 983c7d5..578c4bb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -15,4 +15,6 @@
# the port is a parameter so vservers can share
# IP addresses and still be happy
-modules_dir { [ "munin", "munin/nodes", "munin/plugins" ]: }
+class munin {
+ module_dir { [ "munin", "munin/nodes", "munin/plugins" ]: }
+}