From: Stephen Gran <steve@lobefin.net>
Date: Fri, 16 Oct 2009 20:50:52 +0000 (+0100)
Subject: this might be more clever
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ad5a9488437b6cd83adb83b5440dc8b3806ae80a;hp=18b71e40e21918fdce9d99d25fa966dd0f977896;p=mirror%2Fdsa-puppet.git

this might be more clever

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/munin-node/manifests/apache.pp b/modules/munin-node/manifests/apache.pp
index 6d078f30b..11e58978a 100644
--- a/modules/munin-node/manifests/apache.pp
+++ b/modules/munin-node/manifests/apache.pp
@@ -1,8 +1,8 @@
 class munin-node::apache inherits munin-node {
-        activate_munin_check { "Apache munin plugins":
-              [ script => "apache_accesses";
-                script => "apache_processes";
-                script => "apache_volume"; ]
+        activate_munin_check {
+                "apache_accesses";
+                "apache_processes";
+                "apache_volume";
         }
 }
 
diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 0aadf0181..0fc6d1e41 100644
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -1,6 +1,6 @@
-define activate_munin_check($script) {
-       file { "/etc/munin/plugins/$script":
-                ensure => "/usr/share/munin/plugins/$script",
+define activate_munin_check($name) {
+       file { "/etc/munin/plugins/$name":
+                ensure => "/usr/share/munin/plugins/$name",
                 notify => Exec["munin-node restart"];
         }
 }