X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b0d9abfbd0d3b78db57f09a8976b10a446542a99..027e6c6a30ad50302390f6ea56d3bbf7a49f4fdf:/cookbooks/db/recipes/base.rb?ds=inline diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb index 92d74f86d..ee9d0089f 100644 --- a/cookbooks/db/recipes/base.rb +++ b/cookbooks/db/recipes/base.rb @@ -1,14 +1,14 @@ # -# 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. # 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, @@ -35,18 +35,17 @@ directory "/srv/www.openstreetmap.org" do end rails_port "www.openstreetmap.org" do - ruby "2.3" + ruby "2.5" 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