Only install passenger-common for passenger 3

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

diff --git a/cookbooks/passenger/recipes/default.rb b/cookbooks/passenger/recipes/default.rb
index 6656ce338544a50b91ea9f243c083a8441d6acdc..8b74aa0c0b8883c897e97a649188945fd2e9cc35 100644 (file)
--- a/cookbooks/passenger/recipes/default.rb
+++ b/cookbooks/passenger/recipes/default.rb
@@ -19,6 +19,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]}"
+
 template "/usr/local/bin/passenger-ruby" do
   source "ruby.erb"
   owner "root"
@@ -28,10 +33,13 @@ template "/usr/local/bin/passenger-ruby" do
 end
 
 apache_module "passenger" do
+  version node[:passenger][:version]
   conf "passenger.conf.erb"
 end
 
-package "passenger-common#{node[:passenger][:ruby_version]}"
+if node[:passenger][:version] < "4"
+  package "passenger-common#{node[:passenger][:ruby_version]}"
+end
 
 munin_plugin "passenger_memory"
 munin_plugin "passenger_processes"