From: Tom Hughes <tom@compton.nu>
Date: Tue, 10 Mar 2015 15:48:12 +0000 (+0000)
Subject: Use passenger 4 on production servers
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/d339f3732f8a50db52d82f80e35cf566b6275382?hp=90503ef133f53d9f2d45dea515904965e85222ce;ds=sidebyside

Use passenger 4 on production servers
---

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 050c462ae..01b6b8328 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -91,3 +91,8 @@ apt_source "passenger" do
   url "https://oss-binaries.phusionpassenger.com/apt/passenger"
   key "AC40B2F7"
 end
+
+apt_source "passenger4" do
+  url "https://oss-binaries.phusionpassenger.com/apt/passenger/4"
+  key "AC40B2F7"
+end
diff --git a/cookbooks/passenger/attributes/default.rb b/cookbooks/passenger/attributes/default.rb
index e58c16d2f..c56843893 100644
--- a/cookbooks/passenger/attributes/default.rb
+++ b/cookbooks/passenger/attributes/default.rb
@@ -1,5 +1,10 @@
-default[:apt][:sources] = node[:apt][:sources] |  ["brightbox-ruby-ng", "passenger"]
-
+default[:passenger][:version] = 5
 default[:passenger][:ruby_version] = "1.9.1"
 default[:passenger][:max_pool_size] = 6
 default[:passenger][:pool_idle_time] = 300
+
+if node[:passenger][:version] == 4
+  default[:apt][:sources] = node[:apt][:sources] |  ["brightbox-ruby-ng", "passenger4"]
+else
+  default[:apt][:sources] = node[:apt][:sources] |  ["brightbox-ruby-ng", "passenger"]
+end
diff --git a/roles/web.rb b/roles/web.rb
index 69b6a45d2..7e67d1960 100644
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -14,6 +14,7 @@ default_attributes(
     "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
   },
   :passenger => {
+    :version => 4,
     :pool_idle_time => 0
   },
   :web => {