X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/b0d9abfbd0d3b78db57f09a8976b10a446542a99..f17cb847eed25ce09a134f4047365fdce1512f26:/cookbooks/db/recipes/base.rb

diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb
index 92d74f86d..6d6bc8ddc 100644
--- a/cookbooks/db/recipes/base.rb
+++ b/cookbooks/db/recipes/base.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -34,19 +34,24 @@ 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"
-  repository "git://git.openstreetmap.org/rails.git"
+  repository "https://git.openstreetmap.org/public/rails.git"
   revision "live"
   database_host "localhost"
   database_name "openstreetmap"
   database_username "openstreetmap"
   database_password passwords["openstreetmap"]
   gpx_dir "/store/rails/gpx"
-  file_column_root "/store/rails"
 end
 
 db_version = node[:db][:cluster].split("/").first