From: Tom Hughes <tom@compton.nu>
Date: Tue, 8 Jul 2014 09:16:25 +0000 (+0100)
Subject: Remove hacks added to support passenger 4 upgrade
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c4eb440c675030f75d11eb7d779ea2c08daa41a8

Remove hacks added to support passenger 4 upgrade
---

diff --git a/cookbooks/apache/providers/module.rb b/cookbooks/apache/providers/module.rb
index 31910ed07..17008371e 100644
--- a/cookbooks/apache/providers/module.rb
+++ b/cookbooks/apache/providers/module.rb
@@ -23,9 +23,7 @@ end
 
 action :install do
   if not installed?
-    package package_name do
-      version new_resource.version
-    end
+    package package_name
 
     updated = true
   else
diff --git a/cookbooks/apache/resources/module.rb b/cookbooks/apache/resources/module.rb
index 2d077509f..f2d95551e 100644
--- a/cookbooks/apache/resources/module.rb
+++ b/cookbooks/apache/resources/module.rb
@@ -22,6 +22,5 @@ default_action [:install, :enable]
 
 attribute :name, :kind_of => String, :name_attribute => true
 attribute :package, :kind_of => String
-attribute :version, :kind_of => String
 attribute :conf, :kind_of => String
 attribute :variables, :kind_of => Hash, :default => {}
diff --git a/cookbooks/passenger/attributes/default.rb b/cookbooks/passenger/attributes/default.rb
index eff26a236..a67ac6a04 100644
--- a/cookbooks/passenger/attributes/default.rb
+++ b/cookbooks/passenger/attributes/default.rb
@@ -1,6 +1,5 @@
 default[:apt][:sources] = node[:apt][:sources] |  [ "brightbox-ruby-ng", "passenger" ]
 
-default[:passenger][:version] = "3.0.21"
 default[:passenger][:ruby_version] = "1.9.1"
 default[:passenger][:max_pool_size] = 6
 default[:passenger][:pool_idle_time] = 300
diff --git a/cookbooks/passenger/recipes/default.rb b/cookbooks/passenger/recipes/default.rb
index 8b74aa0c0..267942f0a 100644
--- a/cookbooks/passenger/recipes/default.rb
+++ b/cookbooks/passenger/recipes/default.rb
@@ -33,14 +33,9 @@ template "/usr/local/bin/passenger-ruby" do
 end
 
 apache_module "passenger" do
-  version node[:passenger][:version]
   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"
diff --git a/cookbooks/passenger/templates/default/passenger.conf.erb b/cookbooks/passenger/templates/default/passenger.conf.erb
index 002394f2e..958c729d8 100644
--- a/cookbooks/passenger/templates/default/passenger.conf.erb
+++ b/cookbooks/passenger/templates/default/passenger.conf.erb
@@ -1,16 +1,9 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 <IfModule mod_passenger.c>
-<% if node[:passenger][:version] >= "4" -%>
   PassengerRoot /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini
   PassengerDefaultRuby /usr/bin/ruby
-<% else -%>
-  PassengerRoot /usr
-<% end -%>
   PassengerRuby /usr/local/bin/passenger-ruby
-<% if node[:passenger][:version] < "4" -%>
-  PassengerUseGlobalQueue on
-<% end -%>
   PassengerMaxPoolSize <%= node[:passenger][:max_pool_size] %>
   PassengerPoolIdleTime <%= node[:passenger][:pool_idle_time] %>
 </IfModule>
diff --git a/roles/dev.rb b/roles/dev.rb
index 947c6f54c..fcb243ff3 100644
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -149,9 +149,6 @@ default_attributes(
       }
     }
   },
-  :passenger => {
-    :version => "4.0.45"
-  },
   :postgresql => {
     :versions => [ "9.1" ],
     :settings => {
diff --git a/roles/taginfo.rb b/roles/taginfo.rb
index a49f00d37..ffafde661 100644
--- a/roles/taginfo.rb
+++ b/roles/taginfo.rb
@@ -24,9 +24,6 @@ default_attributes(
       :max_requests_per_child => 10000
     }
   },
-  :passenger => {
-    :version => "4.0.45"
-  },
   :taginfo => {
     :sites => [
       {
diff --git a/roles/web.rb b/roles/web.rb
index a13329d0a..30069f148 100644
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -14,7 +14,6 @@ default_attributes(
     "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
   },
   :passenger => {
-    :version => "4.0.45",
     :pool_idle_time => 0
   },
   :web => {