Merge pull request #50 from Firefishy/add-imagery

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

diff --git a/cookbooks/passenger/recipes/default.rb b/cookbooks/passenger/recipes/default.rb
index 8b74aa0c0b8883c897e97a649188945fd2e9cc35..229281c055167dcec3d3fc362a8761efb6388b0b 100644 (file)
--- 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 "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"
 
 template "/usr/local/bin/passenger-ruby" do
   source "ruby.erb"


@@ -33,14 +36,9 @@ template "/usr/local/bin/passenger-ruby" do
 end
 
 apache_module "passenger" do
 end
 
 apache_module "passenger" do

-  version node[:passenger][:version]

   conf "passenger.conf.erb"
 end
 
   conf "passenger.conf.erb"
 end
 

-if node[:passenger][:version] < "4"
-  package "passenger-common#{node[:passenger][:ruby_version]}"
-end
-

 munin_plugin "passenger_memory"
 munin_plugin "passenger_processes"
 munin_plugin "passenger_queues"
 munin_plugin "passenger_memory"
 munin_plugin "passenger_processes"
 munin_plugin "passenger_queues"