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

diff --git a/manifests/register_snmp.pp b/manifests/register_snmp.pp
deleted file mode 100644
index 1ce606e..0000000
--- a/manifests/register_snmp.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-# snmp_testplugin: the plugin we use to test if it's set
-define munin::register_snmp( $snmpd_testplugin = 'load' )
-{
-  $munin_port_real = $munin_port ? { '' => 4949, default => $munin_port } 
-  $munin_host_real = $munin_host ? {
-    '' => '*',
-    'fqdn' => '*',
-    default => $munin_host
-  }
-
-  exec{"register_snmp_munin_for_${name}":
-    command => "munin-node-configure-snmp ${name} | sh",
-    unless => "test -e /etc/munin/plugins/snmp_${name}_${snmpd_testplugin}",
-  }
-  
-  @@file { "munin_snmp_${name}":
-    path => "/var/lib/puppet/modules/munin/nodes/${name}",
-    ensure => present,
-    content => template("munin/snmpclient.erb"),
-    tag => 'munin',
-  }
-}