diff options
author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-01-20 18:40:04 +0000 |
---|---|---|
committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-01-20 18:40:04 +0000 |
commit | 23201220bf8b7b63da44747be142face0c98eb09 (patch) | |
tree | c1645f62976281a552963b1309307e0d0b6136f3 /manifests/client.pp | |
parent | 7e03247a9e219fe8e57d544957eb06e305e69fc1 (diff) | |
parent | eaa092eb1a8f3ae19551e6e80f84d174211b5208 (diff) |
Merge branch 'merge_immerda' into 'master'
This is my attempt at merging the huge backlog of commits from immerda. I've been pretty verbose about it in redmine so I won't repeat it all here. For details, see:
https://labs.riseup.net/code/issues/4132
Diffstat (limited to 'manifests/client.pp')
-rw-r--r-- | manifests/client.pp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index 2316bc9..aca899a 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 +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, } } } |