Remove hacks added to support passenger 4 upgrade

diff --git a/cookbooks/apache/providers/module.rb b/cookbooks/apache/providers/module.rb
index 31910ed077a919672f5a209ba2dd0ab6311b2ec0..17008371ec844d55698c49fcd2364f87432db2f6 100644 (file)
--- a/cookbooks/apache/providers/module.rb
+++ b/cookbooks/apache/providers/module.rb
@@ -23,9 +23,7 @@ end
 
 action :install do
   if not installed?
 
 action :install do
   if not installed?

-    package package_name do
-      version new_resource.version
-    end
+    package package_name

 
     updated = true
   else
 
     updated = true
   else

diff --git a/cookbooks/apache/resources/module.rb b/cookbooks/apache/resources/module.rb
index 2d077509f5cae0c568890668b84a3b8fa8c3c6ab..f2d95551ec486a42d7709d2cbf3aa4f4b95a5f93 100644 (file)
--- 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 :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 => {}
 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 eff26a2361706180003b27cf616bdbb5d2eb6456..a67ac6a0460fa0b8d5832d1f91c104bc34cbebc6 100644 (file)
--- 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[: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
 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 8b74aa0c0b8883c897e97a649188945fd2e9cc35..267942f0a4c1b5f4c64e5fd71b966b2e609eb8bf 100644 (file)
--- 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
 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"

diff --git a/cookbooks/passenger/templates/default/passenger.conf.erb b/cookbooks/passenger/templates/default/passenger.conf.erb
index 002394f2eac3d6e9ccb3cacccef5947a486a533a..958c729d88eab98fda4cac6745fed53463e13def 100644 (file)
--- 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>
 # 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
   PassengerRoot /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini
   PassengerDefaultRuby /usr/bin/ruby

-<% else -%>
-  PassengerRoot /usr
-<% end -%>

   PassengerRuby /usr/local/bin/passenger-ruby
   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>
   PassengerMaxPoolSize <%= node[:passenger][:max_pool_size] %>
   PassengerPoolIdleTime <%= node[:passenger][:pool_idle_time] %>
 </IfModule>

diff --git a/roles/dev.rb b/roles/dev.rb
index 947c6f54c6e3804180df9a74edfded861ace015c..fcb243ff355b7b55bec08b2e3a1a7b936f8bc441 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -149,9 +149,6 @@ default_attributes(
       }
     }
   },
       }
     }
   },

-  :passenger => {
-    :version => "4.0.45"
-  },

   :postgresql => {
     :versions => [ "9.1" ],
     :settings => {
   :postgresql => {
     :versions => [ "9.1" ],
     :settings => {

diff --git a/roles/taginfo.rb b/roles/taginfo.rb
index a49f00d37987eee7712433b8eac9e077cc0c0809..ffafde6618f7f6db57c9338539a6a778e305b2bb 100644 (file)
--- a/roles/taginfo.rb
+++ b/roles/taginfo.rb
@@ -24,9 +24,6 @@ default_attributes(
       :max_requests_per_child => 10000
     }
   },
       :max_requests_per_child => 10000
     }
   },

-  :passenger => {
-    :version => "4.0.45"
-  },

   :taginfo => {
     :sites => [
       {
   :taginfo => {
     :sites => [
       {

diff --git a/roles/web.rb b/roles/web.rb
index a13329d0a8b2e93dd455b95a242845b2f9bb4745..30069f1482d60c05d6ee4a227e14a23e11ed8ba6 100644 (file)
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -14,7 +14,6 @@ default_attributes(
     "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
   },
   :passenger => {
     "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
   },
   :passenger => {

-    :version => "4.0.45",

     :pool_idle_time => 0
   },
   :web => {
     :pool_idle_time => 0
   },
   :web => {