X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a09e3233db30a99a5640eea3a35919e8970f51aa..56df259055ae541d1f31b8502c549cb84f74778e:/cookbooks/passenger/recipes/default.rb diff --git a/cookbooks/passenger/recipes/default.rb b/cookbooks/passenger/recipes/default.rb index d22543370..229281c05 100644 --- a/cookbooks/passenger/recipes/default.rb +++ b/cookbooks/passenger/recipes/default.rb @@ -21,8 +21,11 @@ include_recipe "apache" package "ruby#{node[:passenger][:ruby_version]}" package "ruby#{node[:passenger][:ruby_version]}-dev" -package "rubygems#{node[:passenger][:ruby_version]}" -package "irb#{node[:passenger][:ruby_version]}" + +if node[:passenger][:ruby_version].to_f < 1.9 + package "rubygems#{node[:passenger][:ruby_version]}" + package "irb#{node[:passenger][:ruby_version]}" +end template "/usr/local/bin/passenger-ruby" do source "ruby.erb" @@ -36,8 +39,6 @@ apache_module "passenger" do conf "passenger.conf.erb" end -package "passenger-common#{node[:passenger][:ruby_version]}" - munin_plugin "passenger_memory" munin_plugin "passenger_processes" munin_plugin "passenger_queues"