diff options
| -rwxr-xr-x | files/munin/passenger_stats | 4 | ||||
| -rw-r--r-- | manifests/init.pp | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/files/munin/passenger_stats b/files/munin/passenger_stats index a117903..f06e88a 100755 --- a/files/munin/passenger_stats +++ b/files/munin/passenger_stats @@ -1,5 +1,7 @@ #!/usr/bin/env ruby +PASSENGER_STATUS = ENV['passenger_status'] || '/usr/local/bin/passenger-status' + def output_config puts <<-END graph_category Passenger @@ -16,7 +18,7 @@ END end def output_values - status = `/usr/sbin/passenger-status` + status = `#{PASSENGER_STATUS}` unless $?.success? $stderr.puts "failed executing passenger-status" exit 1 diff --git a/manifests/init.pp b/manifests/init.pp index f35c188..a5d5ea4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -10,8 +10,10 @@ class passenger ( $use_gems = false, $use_munin = true, $passenger_ensure_version = 'installed', - $librack_ensure_version = 'installed' ) + $librack_ensure_version = 'installed', + $passenger_bin_path = '/usr/sbin' ) { + include apache if ! $use_gems { apache::module { 'passenger': @@ -51,11 +53,11 @@ class passenger ( if $use_munin { case $passenger_memory_munin_config { '': - { $passenger_memory_munin_config = "user root\nenv.passenger_memory_stats /usr/sbin/passenger-memory-stats" } + { $passenger_memory_munin_config = "user root\nenv.passenger_memory_stats $passenger_bin_path/passenger-memory-stats" } } case $passenger_stats_munin_config { '': - { $passenger_stats_munin_config = "user root\n" } + { $passenger_stats_munin_config = "user root\nenv.passenger_status $passenger_bin_path/passenger-status" } } munin::plugin::deploy { |