Merge remote-tracking branch 'openstreetmap/pull/1426'

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

diff --git a/config/example.application.yml b/config/example.application.yml
index f60064a392ebb2bbbed8a4c7526139217e444037..6319be709e5e72a7723273f2b77d005857ae6129 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -6,8 +6,10 @@ defaults: &defaults
   copyright_owner: "OpenStreetMap and contributors"
   attribution_url: "http://www.openstreetmap.org/copyright"
   license_url: "http://opendatacommons.org/licenses/odbl/1-0/"
   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: support@openstreetmap.org

   # Sender addresses for emails
   # Sender addresses for emails

-  email_from: "OpenStreetMap <webmaster@openstreetmap.org>"
+  email_from: "OpenStreetMap <support@openstreetmap.org>"

   email_return_path: "bounces@openstreetmap.org"
   # API version
   api_version: "0.6"
   email_return_path: "bounces@openstreetmap.org"
   # API version
   api_version: "0.6"


@@ -85,16 +87,16 @@ defaults: &defaults
   require_terms_agreed: false
   # Imagery to return in capabilities as blacklisted
   imagery_blacklist:
   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}.*"

   # URL of Overpass instance to use for feature queries
   overpass_url: "//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"
   # URL of Overpass instance to use for feature queries
   overpass_url: "//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"
+  osrm_url: "//router.project-osrm.org/route/v1/driving/"

   # External authentication credentials
   #google_auth_id: ""
   #google_auth_secret: ""
   # External authentication credentials
   #google_auth_id: ""
   #google_auth_secret: ""


@@ -103,10 +105,18 @@ defaults: &defaults
   #facebook_auth_secret: ""
   #windowslive_auth_id: ""
   #windowslive_auth_secret: ""
   #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: ""
   # MapQuest authentication details
   #mapquest_key: ""
   # Mapzen authentication details
   #mapzen_valhalla_key: ""

+  # Thunderforest authentication details
+  #thunderforest_key: ""
+  # Key for generating TOTP tokens
+  #totp_key: ""

 
 development:
   <<: *defaults
 
 development:
   <<: *defaults


@@ -126,3 +136,7 @@ test:
   facebook_auth_secret: "dummy"
   windowslive_auth_id: "dummy"
   windowslive_auth_secret: "dummy"
   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"