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, 10 insertions, 0 deletions

diff --git a/manifests/plugins/linux.pp b/manifests/plugins/linux.pp
new file mode 100644
index 0000000..c7beb59
--- /dev/null
+++ b/manifests/plugins/linux.pp
@@ -0,0 +1,10 @@
+class munin::plugins::linux inherits munin::plugins::base {
+    munin::plugin {
+    	[ df_abs, forks, df_inode, irqstats, entropy, open_inodes ]:
+    		ensure => present;
+    	acpi:
+    		ensure => $acpi_available;
+    }
+
+    include munin::plugins::interfaces
+}