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, 19 insertions, 24 deletions

diff --git a/manifests/client/darwin.pp b/manifests/client/darwin.pp
index 5ae5b60..9cfe7e9 100644
--- a/manifests/client/darwin.pp
+++ b/manifests/client/darwin.pp
@@ -1,27 +1,22 @@
 class munin::client::darwin {
 
-  file { '/usr/share/snmp/snmpd.conf': 
-    mode => 744,
-    content => template("munin/darwin_snmpd.conf.erb"),
-    group  => 0,
-    owner  => root,
-  }
-  
-  delete_matching_line{"startsnmpdno":
-    file => "/etc/hostconfig",
-    pattern => "SNMPSERVER=-NO-",
-  }
-  
-  line { "startsnmpdyes":
-    file => "/etc/hostconfig",
-    line => "SNMPSERVER=-YES-",
-    notify => Exec["/sbin/SystemStarter start SNMP"],
-  }
-  
-  exec{"/sbin/SystemStarter start SNMP":
-    noop => false,
-  }
-  
-  munin::register_snmp { $fqdn: }
-  
+    file { "/usr/share/snmp/snmpd.conf":
+        mode => 744,
+        content => template("munin/darwin_snmpd.conf.erb"),
+        group  => 0,
+        owner  => root,
+    }
+    delete_matching_line{"startsnmpdno":
+        file => "/etc/hostconfig",
+        pattern => "SNMPSERVER=-NO-",
+    }
+    line { "startsnmpdyes":
+        file => "/etc/hostconfig",
+        line => "SNMPSERVER=-YES-",
+        notify => Exec["/sbin/SystemStarter start SNMP"],
+    }
+    exec{"/sbin/SystemStarter start SNMP":
+        noop => false,
+    }
+    munin::register_snmp { $fqdn: }
 }