Merge remote-tracking branch 'immerda/master' into merge_immerda

Conflicts:
	manifests/plugins/interfaces.pp

$real_ifs was changed on master and we'd like to keep that change

$ifs was changed to use the prefix() function and we'd like to keep that
change.

1 files changed, 14 insertions, 10 deletions

diff --git a/manifests/client.pp b/manifests/client.pp
index 2316bc9..724ff05 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -1,29 +1,33 @@
-# client.pp - configure a munin node
 # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
 # See LICENSE for the full license granted to you.
 # Adapted and improved by admin(at)immerda.ch
 
+# configure a munin node
 class munin::client(
-  $allow = [ '127.0.0.1' ],
-  $host = '*',
-  $port = '4949',
-  $use_ssh = false,
-  $manage_shorewall = false,
+  $allow                      = [ '127.0.0.1' ],
+  $host                       = '*',
+  $host_name                  = $::fqdn,
+  $port                       = '4949',
+  $use_ssh                    = false,
+  $manage_shorewall           = false,
   $shorewall_collector_source = 'net',
-  $export_tag = 'munin'
+  $export_tag                 = 'munin',
+  $description                = 'absent',
+  $munin_group                = 'absent',
 ) {
+
   case $::operatingsystem {
     openbsd: { include munin::client::openbsd }
     darwin: { include munin::client::darwin }
     debian,ubuntu: { include munin::client::debian }
     gentoo: { include munin::client::gentoo }
-    centos: { include munin::client::package }
+    centos: { include munin::client::base }
     default: { include munin::client::base }
   }
   if $munin::client::manage_shorewall {
     class{'shorewall::rules::munin':
-      munin_port => $port,
-      munin_collector => delete($allow,'127.0.0.1'),
+      munin_port       => $port,
+      munin_collector  => delete($allow,'127.0.0.1'),
       collector_source => $shorewall_collector_source,
     }
   }