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

diff --git a/manifests/register.pp b/manifests/register.pp
index 59500a0..21f1d35 100644
--- a/manifests/register.pp
+++ b/manifests/register.pp
@@ -1,30 +1,34 @@
-define munin::register(
+define munin::register (
   $host = 'absent',
-  $port = 'absent'
+  $port = 'absent',
+  $description = 'absent',
+  $config = []
 )
 {
-	$munin_port_real = $port ? {
-    'absent' => $munin_port ? {
-                  '' => 4949,
-                  default => $munin_port
-                },
-    default => $port
-  }
+    $fhost = $name
+    $client_type = 'client'
 
-	$munin_host_real = $host ? {
-    'absent' => $munin_host ? {
-                  '' => $fqdn,
-                  'fqdn' => $fqdn,
-                  default => $munin_host
-                },
-    default => $host
-	}
-
-	@@file { "/var/lib/puppet/modules/munin/nodes/${name}_${munin_port_real}":
-		ensure => present,
-		content => template("munin/defaultclient.erb"),
-		tag => 'munin',
-	}
-}
+    $munin_port_real = $port ? {
+        'absent' => $munin_port ? {
+                        '' => 4949,
+                        default => $munin_port
+                    },
+        default => $port
+    }
 
+    $munin_host_real = $host ? {
+        'absent' => $munin_host ? {
+                        '' => $fqdn,
+                        'fqdn' => $fqdn,
+                        default => $munin_host
+                    },
+        default => $host
+    }
 
+    @@file { "munin_client_${fhost}_${munin_port_real}":
+        ensure => present,
+        path => "/var/lib/puppet/modules/munin/nodes/${fhost}_${munin_port_real}",
+        content => template("munin/client.erb"),
+        tag => 'munin',
+    }
+}