Remove workaround for fixed bug in passenger

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

diff --git a/config/example.application.yml b/config/example.application.yml
index 7f6aaf298e5165b795a178a5fd5c405a0c05a01e..2e41adbfc0d8716eaf222bfbc6c29e7739ca3064 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -71,7 +71,7 @@ defaults: &defaults
   # Enable legacy OAuth 1.0 support
   oauth_10_support: true
   # URL of Nominatim instance to use for geocoding
-  nominatim_url: "http://nominatim.openstreetmap.org/"
+  nominatim_url: "//nominatim.openstreetmap.org/"
   # Default editor
   default_editor: "id"
   # OAuth consumer key for Potlatch 2
@@ -84,6 +84,11 @@ defaults: &defaults
   require_terms_seen: false
   # Whether to require users to agree to the CTs before editing
   require_terms_agreed: false
+  # Imagery to return in capabilities as blacklisted
+  imagery_blacklist:
+    - ".*\\.googleapis\\.com/.*"
+    - ".*\\.google\\.com/.*"
+    - ".*\\.google\\.ru/.*"
   # URL of Overpass instance to use for feature queries
   overpass_url: "//overpass-api.de/api/interpreter"
 
@@ -95,3 +100,5 @@ production:
 
 test:
   <<: *defaults
+  # Geonames credentials for testing
+  geonames_username: "dummy"