From 7c1ad16a8056857f76bb15c1cb5cd49368310d0a Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 30 Jun 2018 11:33:46 +0100 Subject: [PATCH] Use ruby 2.5 on Ubuntu 18.04 --- cookbooks/db/recipes/base.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb index 2a509f130..6d6bc8ddc 100644 --- a/cookbooks/db/recipes/base.rb +++ b/cookbooks/db/recipes/base.rb @@ -34,8 +34,14 @@ directory "/srv/www.openstreetmap.org" do mode 0o2775 end +ruby_version = if node[:lsb][:release].to_f >= 18.04 + "2.5" + else + "2.3" + end + rails_port "www.openstreetmap.org" do - ruby "2.3" + ruby ruby_version directory "/srv/www.openstreetmap.org/rails" user "rails" group "rails" -- 2.43.2