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

diff --git a/manifests/client/base.pp b/manifests/client/base.pp
new file mode 100644
index 0000000..b3fcc4a
--- /dev/null
+++ b/manifests/client/base.pp
@@ -0,0 +1,23 @@
+class munin::client::base {
+    service { 'munin-node':
+        ensure => running, 
+        enable => true,
+        hasstatus => true,
+        hasrestart => true,
+    }
+    file {'/etc/munin':
+        ensure => directory,
+        mode => 0755, owner => root, group => 0;
+    }
+    $real_munin_allow = $munin_allow ? {
+        '' => '127.0.0.1',
+        default => $munin_allow
+    }
+    file {'/etc/munin/munin-node.conf':
+	    content => template("munin/munin-node.conf.$operatingsystem"),
+        notify => Service['munin-node'],
+		mode => 0644, owner => root, group => 0,
+	}
+	munin::register { $fqdn: }
+	include munin::plugins::base
+}