Switch forum.osm.org to letsencrypt

[chef.git] / cookbooks / passenger / recipes / default.rb

diff --git a/cookbooks/passenger/recipes/default.rb b/cookbooks/passenger/recipes/default.rb
index 6656ce338544a50b91ea9f243c083a8441d6acdc..89292e048992cc007a8f93ab2fde8fc4f77a6c63 100644 (file)
--- a/cookbooks/passenger/recipes/default.rb
+++ b/cookbooks/passenger/recipes/default.rb
@@ -19,11 +19,19 @@
 
 include_recipe "apache"
 
+package "ruby#{node[:passenger][:ruby_version]}"
+package "ruby#{node[:passenger][:ruby_version]}-dev"
+
+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"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   notifies :reload, "service[apache2]"
 end
 
@@ -31,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"