From dcdadb9a99917ab7214fcb57c64cab2047cd8fe3 Mon Sep 17 00:00:00 2001
From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Tue, 4 Dec 2007 18:55:43 +0000
Subject: war ein anderer fehler ... shit

git-svn-id: https://svn/ipuppet/trunk/modules/munin@194 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp |  4 ++--
 manifests/plugin.pp | 18 ++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'manifests')

diff --git a/manifests/client.pp b/manifests/client.pp
index 47df43d..639d133 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -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":
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index 5b1bfc3..e361d69 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -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];
 		}
 }
 
-- 
cgit v1.2.3