this require is pretty useless, as if we have a require on the define, we do not...
authormh <mh@immerda.ch>
Thu, 28 Feb 2013 19:23:10 +0000 (20:23 +0100)
committermh <mh@immerda.ch>
Thu, 28 Feb 2013 19:23:10 +0000 (20:23 +0100)
manifests/plugin/deploy.pp

index 2928a3a..53f6481 100644 (file)
@@ -2,7 +2,7 @@
 define munin::plugin::deploy(
   $ensure = 'present',
   $source = '',
-  $config = '',
+  $config = ''
 ) {
   $plugin_src = $ensure ? {
     'present' => $name,
@@ -32,23 +32,12 @@ define munin::plugin::deploy(
     openbsd: { $basic_require = File['/var/run/munin'] }
     default: { $basic_require = Package['munin-node'] }
   }
-  if $require {
-    File["munin_plugin_${name}"]{
-      require => [ $basic_require, $require ],
-    }
-  } else {
-    File["munin_plugin_${name}"]{
-      require => $basic_require,
-    }
+  File["munin_plugin_${name}"]{
+    require => $basic_require,
   }
   # register the plugin
   munin::plugin{$name:
     ensure => $ensure,
     config => $config
   }
-  if $require {
-    Munin::Plugin[$name]{
-      require => $require
-    }
-  }
 }