Merge remote-tracking branch 'shared/master' into leap_masterHEADmaster

1 files changed, 9 insertions, 16 deletions

diff --git a/manifests/client.pp b/manifests/client.pp
index 2316bc9..afab5f1 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -1,30 +1,23 @@
-# 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
 
-class munin::client(
-  $allow = [ '127.0.0.1' ],
-  $host = '*',
-  $port = '4949',
-  $use_ssh = false,
-  $manage_shorewall = false,
-  $shorewall_collector_source = 'net',
-  $export_tag = 'munin'
-) {
+# configure a munin node
+# WARNING: this class should not be included directly. See the 'munin' class.
+class munin::client {
+
   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 {
+  if $munin::manage_shorewall {
     class{'shorewall::rules::munin':
-      munin_port => $port,
-      munin_collector => delete($allow,'127.0.0.1'),
-      collector_source => $shorewall_collector_source,
+      munin_port       => $munin::port,
+      munin_collector  => delete($munin::allow,'127.0.0.1'),
+      collector_source => $munin::shorewall_collector_source,
     }
   }
 }