war ein anderer fehler ... shit
authorandreas <andreas@immerda.ch>
Tue, 4 Dec 2007 18:55:43 +0000 (18:55 +0000)
committerandreas <andreas@immerda.ch>
Tue, 4 Dec 2007 18:55:43 +0000 (18:55 +0000)
manifests/client.pp
manifests/plugin.pp

index 47df43d..639d133 100644 (file)
@@ -145,8 +145,8 @@ class munin::client::gentoo
                        mode => 0644, owner => root, group => root,
                        # 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"],
+                       notify => Service["munin"],
        }
 
        service { "munin":
index 5b1bfc3..e361d69 100644 (file)
@@ -8,8 +8,8 @@ define munin::plugin (
        $config = '')
 {
        case $operatingsystem {
-               debian: {       $munin-node-service = "munin-node"; }
-               gentoo: {       $munin-node-service = "munin"; }
+               debian: {       $munin_node_service = "munin-node"; }
+               gentoo: {       $munin-node_service = "munin"; }
        }
        $plugin_src = $ensure ? { "present" => $name, default => $ensure }
        debug ( "munin_plugin: name=$name, ensure=$ensure, script_path=$script_path" )
@@ -25,8 +25,8 @@ define munin::plugin (
                        debug ( "munin_plugin: making $plugin using src: $plugin_src" )
                        file { $plugin:
                                ensure => "$script_path/${plugin_src}",
-                               require => Package[$munin-node-service],
-                               #notify => Service[$munin-node-service],
+                               require => Package[$munin_node_service],
+                               notify => Service[$munin_node_service],
                        }
                }
        }
@@ -74,8 +74,8 @@ define munin::remoteplugin($ensure = "present", $source, $config = '') {
 class munin::plugins::base-debian {
 
        case $operatingsystem {
-               gentoo: {       $munin-node-service = "munin"; }
-               debian: {       $munin-node-service = "munin-node"; }
+               gentoo: {       $munin_node_service = "munin"; }
+               debian: {       $munin_node_service = "munin-node"; }
        }
                file {
                        [ "/etc/munin/plugins", "/etc/munin/plugin-conf.d" ]:
@@ -83,13 +83,11 @@ class munin::plugins::base-debian {
                                ensure => directory, checksum => mtime,
                                recurse => true, purge => true, force => true, 
                                mode => 0755, owner => root, group => root;
-                               #notify => Service[$munin-node-service];
-                               #notify => Service[munin];
+                               notify => Service[$munin_node_service];
                        "/etc/munin/plugin-conf.d/munin-node":
                                ensure => present, 
                                mode => 0644, owner => root, group => root;
-                       #       notify => Service[$munin-node-service];
-                               # notify => Service[munin];
+                               notify => Service[$munin_node_service];
                }
 }