From: Tom Hughes Date: Mon, 11 Jan 2016 19:07:48 +0000 (+0000) Subject: Switch to the Mapbox OSM instance X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/4bfd3b66e6fc725fb406068a955bb3aeea394f90?hp=b577c05d0145a6daea265427f85bed96235eab9e Switch to the Mapbox OSM instance --- diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb index f0dd581d8..f3d89d057 100644 --- a/cookbooks/web/definitions/rails_port.rb +++ b/cookbooks/web/definitions/rails_port.rb @@ -164,6 +164,10 @@ define :rails_port, :action => [:create, :enable] do line.gsub!(/^( *)nominatim_url:.*$/, "\\1nominatim_url: \"#{params[:nominatim_url]}\"") end + if params[:osrm_url] + line.gsub!(/^( *)osrm_url:.*$/, "\\1osrm_url: \"#{params[:osrm_url]}\"") + end + if params[:google_auth_id] line.gsub!(/^( *)#google_auth_id:.*$/, "\\1google_auth_id: \"#{params[:google_auth_id]}\"") line.gsub!(/^( *)#google_auth_secret:.*$/, "\\1google_auth_secret: \"#{params[:google_auth_secret]}\"") diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index 632a627cc..47010c722 100644 --- a/cookbooks/web/recipes/rails.rb +++ b/cookbooks/web/recipes/rails.rb @@ -77,6 +77,7 @@ rails_port "www.openstreetmap.org" do windowslive_auth_id "0000000040153C51" windowslive_auth_secret web_passwords["windowslive_auth_secret"] mapzen_valhalla_key web_passwords["mapzen_valhalla_key"] + osrm_url "//api-osrm-routed-production.tilestream.net/viaroute" end package "libjson-xs-perl"