From: Tom Hughes <tom@compton.nu>
Date: Fri, 1 Jul 2016 11:29:39 +0000 (+0100)
Subject: Switch web servers at Bytemark to ruby 2.3
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/771abb774d2658685bfce5b3c44b76ae86873966

Switch web servers at Bytemark to ruby 2.3
---

diff --git a/cookbooks/passenger/attributes/default.rb b/cookbooks/passenger/attributes/default.rb
index e9a517c3f..8980fff57 100644
--- a/cookbooks/passenger/attributes/default.rb
+++ b/cookbooks/passenger/attributes/default.rb
@@ -1,4 +1,4 @@
-default[:passenger][:ruby_version] = "2.1"
+default[:passenger][:ruby_version] = "2.3"
 default[:passenger][:max_pool_size] = 6
 default[:passenger][:pool_idle_time] = 300
 
diff --git a/roles/dev.rb b/roles/dev.rb
index c69219e54..b3c0d4eb0 100644
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -127,9 +127,6 @@ default_attributes(
       }
     }
   },
-  :passenger => {
-    :ruby_version => "2.3"
-  },
   :postgresql => {
     :versions => ["9.1", "9.3"],
     :settings => {
diff --git a/roles/ic.rb b/roles/ic.rb
index a2291c4e3..de7a1c19e 100644
--- a/roles/ic.rb
+++ b/roles/ic.rb
@@ -29,9 +29,6 @@ default_attributes(
       }
     }
   },
-  :passenger => {
-    :ruby_version => "2.3"
-  },
   :web => {
     :backends => %w(rails1 rails2 rails3),
     :fileserver => "ironbelly",
diff --git a/roles/taginfo.rb b/roles/taginfo.rb
index 53b151911..4b0fb23bd 100644
--- a/roles/taginfo.rb
+++ b/roles/taginfo.rb
@@ -24,9 +24,6 @@ default_attributes(
       :max_requests_per_child => 10000
     }
   },
-  :passenger => {
-    :ruby_version => "2.3"
-  },
   :taginfo => {
     :sites => [
       {