summaryrefslogtreecommitdiff
path: root/manifests/client.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2011-03-25 00:01:54 -0400
committerMicah Anderson <micah@riseup.net>2011-03-25 00:01:54 -0400
commit5218993abef2a8bf79278d4d84123843279735c5 (patch)
tree8fe859ba86b83e4b9782ac19a37c89bf5cf5f0ba /manifests/client.pp
parentb3e29447187e289c60a4a9f7830032f1b10fae2f (diff)
parente7d23dabf191c5416197af0b229fc90b94539405 (diff)
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
Diffstat (limited to 'manifests/client.pp')
-rw-r--r--manifests/client.pp38
1 files changed, 18 insertions, 20 deletions
diff --git a/manifests/client.pp b/manifests/client.pp
index 234523f..273070d 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -5,24 +5,22 @@
class munin::client inherits munin {
- $munin_port_real = $munin_port ? { '' => 4949, default => $munin_port }
- $munin_host_real = $munin_host ? {
- '' => '*',
- 'fqdn' => '*',
- default => $munin_host
- }
-
- 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::centos }
- default: { include munin::client::base }
- }
-
- if $use_shorewall {
- include shorewall::rules::munin
- }
-
+ $munin_port_real = $munin_port ? { '' => 4949, default => $munin_port }
+ $munin_host_real = $munin_host ? {
+ '' => '*',
+ 'fqdn' => '*',
+ default => $munin_host
+ }
+
+ 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 }
+ default: { include munin::client::base }
+ }
+ if $use_shorewall {
+ include shorewall::rules::munin
+ }
}