Merge commit '76352415fec5c2ab6975e3a8843dd4983f7cae6a'

Conflicts:
	README
	lib/facter/acpi_available.rb
	lib/facter/interfaces.rb
	lib/facter/munin_interfaces.rb
	manifests/client.pp
	manifests/host.pp
	manifests/init.pp
	manifests/plugin.pp
	plugins/facter/interfaces.rb
	templates/defaultclient.erb
	templates/munin-node.conf.Debian.lenny

1 files changed, 37 insertions, 0 deletions

diff --git a/manifests/plugin/deploy.pp b/manifests/plugin/deploy.pp
new file mode 100644
index 0000000..846a873
--- /dev/null
+++ b/manifests/plugin/deploy.pp
@@ -0,0 +1,37 @@
+define munin::plugin::deploy($source = '', $ensure = 'present', $config = '') {
+    $plugin_src = $ensure ? {
+        'present' => $name,
+        'absent' => $name,
+        default => $ensure
+    }
+    $real_source = $source ? {
+        ''  =>  "munin/plugins/$plugin_src",
+        default => $source
+    }
+    include munin::plugin::scriptpaths
+    file { "munin_plugin_${name}":
+            path => "$munin::plugin::scriptpaths::script_path/${name}",
+            source => "puppet://$server/modules/$real_source",
+            mode => 0755, owner => root, group => 0;
+    }
+
+    case $kernel {
+        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,
+        }
+    }
+    # register the plugin
+    if $require {
+        munin::plugin{$name: ensure => $ensure, config => $config, require => $require }
+    } else {
+        munin::plugin{$name: ensure => $ensure, config => $config }
+    }
+}