diff options
| author | Micah Anderson <micah@riseup.net> | 2009-12-22 19:48:36 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2009-12-22 19:48:36 -0500 |
| commit | 8f711a933dbc0917b43d5e29b98da7157bd5727f (patch) | |
| tree | 8662b3089ee084dfb3d87c929c0574fef3d1c4ee /manifests/client.pp | |
| parent | 42c94b4fad526b25852c7bcaf053f441bac38c9e (diff) | |
fix some merge problems
Diffstat (limited to 'manifests/client.pp')
| -rw-r--r-- | manifests/client.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index d033c28..24d84da 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -3,7 +3,7 @@ # See LICENSE for the full license granted to you. # Adapted and improved by admin(at)immerda.ch -class munin::client { +class munin::client inherits munin { $munin_port_real = $munin_port ? { '' => 4949, default => $munin_port } $munin_host_real = $munin_host ? { |