From: Tom Hughes <tom@compton.nu>
Date: Mon, 7 Dec 2015 14:35:51 +0000 (+0000)
Subject: Default to ruby 2.1 for passenger applications
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/303d26b211fb0f3dc57bb79add6b23e748debb6d?hp=f4ea2c7270a0b80748cc3efb58d12300b4c2061e;ds=sidebyside

Default to ruby 2.1 for passenger applications
---

diff --git a/cookbooks/passenger/attributes/default.rb b/cookbooks/passenger/attributes/default.rb
index 56816eac7..e9a517c3f 100644
--- a/cookbooks/passenger/attributes/default.rb
+++ b/cookbooks/passenger/attributes/default.rb
@@ -1,4 +1,4 @@
-default[:passenger][:ruby_version] = "1.9.1"
+default[:passenger][:ruby_version] = "2.1"
 default[:passenger][:max_pool_size] = 6
 default[:passenger][:pool_idle_time] = 300
 
diff --git a/roles/dev.rb b/roles/dev.rb
index 21a4b159f..4572bb370 100644
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -123,9 +123,6 @@ default_attributes(
       }
     }
   },
-  :passenger => {
-    :ruby_version => "2.1"
-  },
   :postgresql => {
     :versions => ["9.1", "9.3"],
     :settings => {