diff options
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index ffeeb7d..a5d5ea4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -10,19 +10,25 @@ 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': ensure => $passenger_ensure_version, package_name => 'libapache2-mod-passenger'; } - + if !defined(Package["librack-ruby"]) { - package { - [ "librack-ruby", "librack-ruby1.8"] : + if $::lsbdistcodename == 'squeeze' { + package { 'librack-ruby1.8': ensure => $librack_ensure_version } + } + else { + package { 'ruby-rack': ensure => $librack_ensure_version; + } } } } @@ -47,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 { |