correctly include the right client class
authormh <mh@immerda.ch>
Tue, 29 Sep 2009 21:02:47 +0000 (23:02 +0200)
committermh <mh@immerda.ch>
Tue, 29 Sep 2009 21:02:47 +0000 (23:02 +0200)
manifests/client.pp
manifests/client/gentoo.pp
manifests/plugin.pp

index bf49f44..d033c28 100644 (file)
@@ -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 {
index 761742e..53d472b 100644 (file)
@@ -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
 }
index 01eda76..1fa4651 100644 (file)
@@ -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 }