Merge commit 'e7d23dabf191c5416197af0b229fc90b94539405'

Conflicts:
	manifests/client.pp
	manifests/client/base.pp
	manifests/client/darwin.pp
	manifests/client/debian.pp
	manifests/client/gentoo.pp
	manifests/client/openbsd.pp
	manifests/client/package.pp
	manifests/host.pp
	manifests/init.pp
	manifests/plugin.pp
	manifests/plugin/scriptpaths.pp
	manifests/plugins/interfaces.pp
	manifests/plugins/linux.pp
	manifests/plugins/vserver.pp
	manifests/register.pp
	manifests/register_snmp.pp
	manifests/remoteplugin.pp
	manifests/snmp_collector.pp

1 files changed, 23 insertions, 26 deletions

diff --git a/manifests/client/base.pp b/manifests/client/base.pp
index 0f0feca..7c2adc2 100644
--- a/manifests/client/base.pp
+++ b/manifests/client/base.pp
@@ -1,29 +1,26 @@
 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
-  
+    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:
+        config => [ 'use_node_name yes', 'load.load.warning 5', 'load.load.critical 10'],
+    }
+    include munin::plugins::base
 }