X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7c1ad16a8056857f76bb15c1cb5cd49368310d0a..027e6c6a30ad50302390f6ea56d3bbf7a49f4fdf:/cookbooks/db/recipes/base.rb?ds=sidebyside diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb index 6d6bc8ddc..ee9d0089f 100644 --- a/cookbooks/db/recipes/base.rb +++ b/cookbooks/db/recipes/base.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: db +# Cookbook:: db # Recipe:: base # -# Copyright 2011, OpenStreetMap Foundation +# Copyright:: 2011, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -34,14 +34,8 @@ 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 ruby_version + ruby "2.5" directory "/srv/www.openstreetmap.org/rails" user "rails" group "rails"