Merge remote-tracking branch 'upstream/pull/1961'

[rails.git] / config / example.application.yml

diff --git a/config/example.application.yml b/config/example.application.yml
index 45c0a39c4aca3cfbd1d3be77e79d6f2d3d222f76..b6884825b5c68f137a368a16053f68300a692bf3 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -50,9 +50,8 @@ defaults: &defaults
   #messages_domain: "messages.openstreetmap.org"
   # Geonames authentication details
   #geonames_username: ""
-  # Quova authentication details
-  #quova_username: ""
-  #quova_password: ""
+  # GeoIP database
+  #geoip_database: ""
   # Users to show as being nearby
   nearby_users: 30
   # Max radius, in km, for nearby users
@@ -75,7 +74,7 @@ defaults: &defaults
   # Enable legacy OAuth 1.0 support
   oauth_10_support: true
   # URL of Nominatim instance to use for geocoding
-  nominatim_url: "//nominatim.openstreetmap.org/"
+  nominatim_url: "https://nominatim.openstreetmap.org/"
   # Default editor
   default_editor: "id"
   # OAuth consumer key for Potlatch 2
@@ -95,13 +94,14 @@ defaults: &defaults
     - ".*\\.google(apis)?\\..*/(vt|kh)[\\?/].*([xyz]=.*){3}.*"
     # Blacklist VWorld
     - "http://xdworld\\.vworld\\.kr:8080/.*"
+    # Blacklist here
+    - ".*\\.here\\.com[/:].*"
   # URL of Overpass instance to use for feature queries
-  overpass_url: "//overpass-api.de/api/interpreter"
+  overpass_url: "https://overpass-api.de/api/interpreter"
   # Routing endpoints
-  graphhopper_url: "//graphhopper.com/api/1/route"
-  mapquest_directions_url: "//open.mapquestapi.com/directions/v2/route"
-  mapzen_valhalla_url: "//valhalla.mapzen.com/route"
-  osrm_url: "//router.project-osrm.org/route/v1/driving/"
+  graphhopper_url: "https://graphhopper.com/api/1/route"
+  mapquest_directions_url: "https://open.mapquestapi.com/directions/v2/route"
+  osrm_url: "https://router.project-osrm.org/route/v1/driving/"
   # External authentication credentials
   #google_auth_id: ""
   #google_auth_secret: ""
@@ -116,12 +116,12 @@ defaults: &defaults
   #wikipedia_auth_secret: ""
   # MapQuest authentication details
   #mapquest_key: ""
-  # Mapzen authentication details
-  #mapzen_valhalla_key: ""
   # Thunderforest authentication details
   #thunderforest_key: ""
   # Key for generating TOTP tokens
   #totp_key: ""
+  # Enforce Content-Security-Policy
+  csp_enforce: false
   # URL for reporting Content-Security-Policy violations
   #csp_report_url: ""