From: Tom Hughes <tom@compton.nu>
Date: Wed, 27 Jul 2016 17:50:38 +0000 (+0100)
Subject: Use ruby 2.3 on Ubuntu 16.04 database servers
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/2db5972d9f9604f3c3d7b8167fa3a740e6db7e03?hp=fccb66498e9111626aa4cc21d4e5ac0d5b161bc1

Use ruby 2.3 on Ubuntu 16.04 database servers
---

diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb
index 17dd43d11..4ed0a1e5c 100644
--- a/cookbooks/db/recipes/base.rb
+++ b/cookbooks/db/recipes/base.rb
@@ -32,8 +32,14 @@ directory "/srv/www.openstreetmap.org" do
   mode 0o2775
 end
 
+ruby_version = if node[:lsb][:release].to_f >= 16.04
+                 "2.3"
+               else
+                 "2.1"
+               end
+
 rails_port "www.openstreetmap.org" do
-  ruby "2.1"
+  ruby ruby_version
   directory "/srv/www.openstreetmap.org/rails"
   user "rails"
   group "rails"