Add a couple of notes to the vagrant instructions

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

diff --git a/config/example.application.yml b/config/example.application.yml
index 1f0705bd3a03adbbf561f98d900f51ce34b9b0fd..6319be709e5e72a7723273f2b77d005857ae6129 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -87,9 +87,9 @@ 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}.*"
   # URL of Overpass instance to use for feature queries
   overpass_url: "//overpass-api.de/api/interpreter"
   # Routing endpoints
@@ -107,10 +107,16 @@ defaults: &defaults
   #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: ""
 
 development:
   <<: *defaults
@@ -132,3 +138,5 @@ test:
   windowslive_auth_secret: "dummy"
   github_auth_id: "dummy"
   github_auth_secret: "dummy"
+  wikipedia_auth_id: "dummy"
+  wikipedia_auth_secret: "dummy"