From 6f3d5ae95495d024f69c8ab29ca42558a796aa0c Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 6 Feb 2008 20:31:50 +0000
Subject: fixed? munin plugin problems

---
 manifests/plugin.pp | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'manifests/plugin.pp')

diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index 5fd4190..97c89b2 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -9,23 +9,15 @@ define munin::plugin (
 {
 	case $operatingsystem {
 		gentoo: {	
-			$munin_node_package = "munin" 
-			$munin_node_service = "munin-node" 
             $script_path =  "/usr/libexec/munin/plugins"
 			}
 		debian: {		
-			$munin_node_service = "munin-node" 
-			$munin_node_package = "munin-node" 
             $script_path =  "/usr/share/munin/plugins"
 			}
 		centos: {		
-			$munin_node_service = "munin-node" 
-			$munin_node_package = "munin-node" 
             $script_path =  "/usr/share/munin/plugins"
 			}
 		default: {
-			$munin_node_service = "munin-node"
-			$munin_node_package = "munin-node" 
             $script_path =  "/usr/share/munin/plugins"
 		}
 	}
@@ -47,14 +39,14 @@ define munin::plugin (
 				centos, gentoo: {	
 					file { $plugin:
 						ensure => "$script_path/${plugin_src}",
-						require => Package[$munin_node_package];
+						require => Package['munin-node'];
 					}
 				}
 				default: {
 					file { $plugin:
 						ensure => "$script_path/${plugin_src}",
-						require => Package[$munin_node_package],
-						notify => Service[$munin_node_service];
+						require => Package['munin-node'],
+						notify => Service['munin-node'];
 					}
 				}
 			}
@@ -123,11 +115,12 @@ class munin::plugins::base {
 				ensure => directory, checksum => mtime,
 				recurse => true, purge => true, force => true, 
 				mode => 0755, owner => root, group => 0,
-				notify => Service["$munin_node_service"];
+				notify => Service['munin-node'];
 			"/etc/munin/plugin-conf.d/munin-node":
 				ensure => present, 
 				mode => 0644, owner => root, group => 0,
-				notify => Service[$munin_node_service];
+				notify => Service['munin-node'],
+                before => Package['munin-node'];
 		    }
 		}
 	}
-- 
cgit v1.2.3