fixed typo
[puppet_munin.git] / manifests / client.pp
index af2c523..dbf175a 100644 (file)
@@ -39,9 +39,6 @@ class munin::client {
                                guest: { include munin::plugins::vserver }
                                default: {
                                        include munin::plugins::linux
-                                       case $virtual {
-                                               xen0: { include munin::plugins::dom0 }
-                                       }
                                }
                        }
                }
@@ -49,6 +46,11 @@ class munin::client {
                        err( "Don't know which munin plugins to install for $kernel" )
                }
        }
+       case $virtual {
+        physical: { include munin::plugins::physical }
+           xen0: { include munin::plugins::dom0 }
+        xenu: { include munin::plugins::domU }
+    }
 
 }
 
@@ -100,9 +102,9 @@ class munin::client::darwin
 
 class munin::client::debian 
 {
-    $script_path_default =  "/usr/share/munin/plugins"
-
        package { "munin-node": ensure => installed }
+    # the plugin will need that
+       package { "iproute": ensure => installed }
 
        file {
                "/etc/munin/":
@@ -131,9 +133,9 @@ class munin::client::debian
 
 class munin::client::gentoo 
 {
-    $script_path_default =  "/usr/libexec/munin/plugins"
     $acpi_available = "absent"
-    package { 'munin':
+    package { 'munin-node':
+                name => 'munin',
                 ensure => present,
                 category => $operatingsystem ? {
                         gentoo => 'net-analyzer',
@@ -141,7 +143,6 @@ class munin::client::gentoo
                 },
     }
 
-
        file {
                "/etc/munin/":
                        ensure => directory,
@@ -151,11 +152,11 @@ class munin::client::gentoo
                        mode => 0644, owner => root, group => 0,
                        # this has to be installed before the package, so the postinst can
                        # boot the munin-node without failure!
-                       before => Package["munin"],
-                       notify => Service["munin"],
+                       before => Package["munin-node"],
+           #           notify => Service["munin"],
        }
 
-       service { "munin":
+       service { "munin-node":
                ensure => running, 
        }
 
@@ -164,13 +165,8 @@ class munin::client::gentoo
 
 class munin::client::centos 
 {
-    $script_path_default =  "/usr/share/munin/plugins"
-    package { 'munin':
+    package { 'munin-node':
                 ensure => present,
-                category => $operatingsystem ? {
-                        gentoo => 'net-analyzer',
-                        default => '',
-                },
     }
 
 
@@ -183,8 +179,8 @@ class munin::client::centos
                        mode => 0644, owner => root, group => 0,
                        # this has to be installed before the package, so the postinst can
                        # boot the munin-node without failure!
-                       before => Package["munin"],
-                       notify => Service["munin"],
+                       before => Package["munin-node"],
+                       notify => Service["munin-node"],
        }
 
        service { "munin-node":
@@ -195,3 +191,4 @@ class munin::client::centos
 
 }
 
+