Update to rails 5.2.0

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

diff --git a/config/example.application.yml b/config/example.application.yml
index f60064a392ebb2bbbed8a4c7526139217e444037..b6884825b5c68f137a368a16053f68300a692bf3 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -1,14 +1,19 @@
 defaults: &defaults
-  # The server URL
-  server_url: "www.openstreetmap.org"
+  # The server protocol and host
+  server_protocol: "http"
+  server_url: "openstreetmap.example.com"
+  # Publisher
+  #publisher_url: ""
   # The generator
   generator: "OpenStreetMap server"
   copyright_owner: "OpenStreetMap and contributors"
   attribution_url: "http://www.openstreetmap.org/copyright"
   license_url: "http://opendatacommons.org/licenses/odbl/1-0/"
+  # Support email address
+  support_email: "openstreetmap@example.com"
   # Sender addresses for emails
-  email_from: "OpenStreetMap <webmaster@openstreetmap.org>"
-  email_return_path: "bounces@openstreetmap.org"
+  email_from: "OpenStreetMap <openstreetmap@example.com>"
+  email_return_path: "openstreetmap@example.com"
   # API version
   api_version: "0.6"
   # Application status - possible values are:
@@ -45,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
@@ -70,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
@@ -85,16 +89,19 @@ defaults: &defaults
   require_terms_agreed: false
   # Imagery to return in capabilities as blacklisted
   imagery_blacklist:
-    - ".*\\.googleapis\\.com/.*"
-    - ".*\\.google\\.com/.*"
-    - ".*\\.google\\.ru/.*"
+    # Current Google imagery URLs have google or googleapis in the domain
+    # with a vt or kh endpoint, and x, y and z query parameters
+    - ".*\\.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/viaroute"
+  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: ""
@@ -103,10 +110,20 @@ defaults: &defaults
   #facebook_auth_secret: ""
   #windowslive_auth_id: ""
   #windowslive_auth_secret: ""
+  #github_auth_id: ""
+  #github_auth_secret: ""
+  #wikipedia_auth_id: ""
+  #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: ""
 
 development:
   <<: *defaults
@@ -126,3 +143,7 @@ test:
   facebook_auth_secret: "dummy"
   windowslive_auth_id: "dummy"
   windowslive_auth_secret: "dummy"
+  github_auth_id: "dummy"
+  github_auth_secret: "dummy"
+  wikipedia_auth_id: "dummy"
+  wikipedia_auth_secret: "dummy"