summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2009-09-29 23:02:47 +0200
committermh <mh@immerda.ch>2009-09-29 23:02:47 +0200
commita385bc413215ac5aa6b646c3e4ebf59063230bd8 (patch)
treeb8341965578c9ed8dff225f2e3af1680eed2877f
parent4b0841f9f2bcc58cd2da1f8913d7e4f05211888d (diff)
correctly include the right client class
-rw-r--r--manifests/client.pp1
-rw-r--r--manifests/client/gentoo.pp9
-rw-r--r--manifests/plugin.pp1
3 files changed, 5 insertions, 6 deletions
diff --git a/manifests/client.pp b/manifests/client.pp
index bf49f44..d033c28 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -17,6 +17,7 @@ class munin::client {
darwin: { include munin::client::darwin }
debian,ubuntu: { include munin::client::debian }
gentoo: { include munin::client::gentoo }
+ centos: { include munin::client::package }
default: { include munin::client::base }
}
if $use_shorewall {
diff --git a/manifests/client/gentoo.pp b/manifests/client/gentoo.pp
index 761742e..53d472b 100644
--- a/manifests/client/gentoo.pp
+++ b/manifests/client/gentoo.pp
@@ -1,9 +1,8 @@
class munin::client::gentoo inherits munin::client::package {
- Package['munin-node'] {
- name => 'munin',
- category => 'net-analyzer',
- }
+ Package['munin-node'] {
+ name => 'munin',
+ category => 'net-analyzer',
+ }
-
include munin::plugins::gentoo
}
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index 01eda76..1fa4651 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -10,7 +10,6 @@ define munin::plugin (
$script_path_in = '',
$config = '')
{
- include ::munin::client
include munin::plugin::scriptpaths
$real_script_path = $script_path_in ? { '' => $munin::plugin::scriptpaths::script_path, default => $script_path_in }