summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2010-05-07 11:45:48 -0400
committerMicah Anderson <micah@riseup.net>2010-05-07 11:45:48 -0400
commitfaf21f62222898758cdec3ce1207bf02d5dbeb78 (patch)
tree8c838d7f9a60b51455ca2fa9e842dad991d1858f
parent47694168cdb741f42e0152432261eeba48d91829 (diff)
make the configurable munin variable a little cleaner
-rw-r--r--manifests/init.pp14
1 files changed, 6 insertions, 8 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 8e8b78b..ba19f1f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -9,14 +9,12 @@
class passenger {
- $real_passenger_memory_munin_config = $passenger_memory_munin_config ? {
- '' => "user root\nenv.passenger_memory_stats /usr/sbin/passenger-memory-stats",
- default => $passenger_memory_munin_config,
+ case $passenger_memory_munin_config { '':
+ { $passenger_memory_munin_config = "user root\nenv.passenger_memory_stats /usr/sbin/passenger-memory-stats" }
}
- $real_passenger_stats_munin_config = $passenger_stats_munin_config ? {
- '' => "user root",
- default => $passenger_stats_munin_config,
+ case $passenger_stats_munin_config { '':
+ { $passenger_stats_munin_config = "user root\n" }
}
if !defined(Package["libapache2-mod-passenger"]) {
@@ -41,9 +39,9 @@ class passenger {
munin::plugin::deploy {
'passenger_memory_stats':
source => "passenger/munin/passenger_memory_stats",
- config => $real_passenger_memory_munin_config;
+ config => $passenger_memory_munin_config;
'passenger_stats':
source => "passenger/munin/passenger_stats",
- config => $real_passenger_stats_munin_config;
+ config => $passenger_stats_munin_config;
}
}