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

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index 0f64382c9f4e39fe837765def550a8a063b620f8..049844d3d5b6a217fbf48fa7c46b6b860298c362 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -49,8 +49,8 @@ max_messages_per_hour: 60
 #messages_domain: "messages.openstreetmap.org"
 # Geonames authentication details
 #geonames_username: ""
-# GeoIP database
-#geoip_database: ""
+# MaxMind GeoIPv2 database
+#maxmind_database: ""
 # Users to show as being nearby
 nearby_users: 30
 # Max radius, in km, for nearby users
@@ -82,8 +82,6 @@ oauth_10_support: true
 nominatim_url: "https://nominatim.openstreetmap.org/"
 # Default editor
 default_editor: "id"
-# OAuth consumer key for Potlatch 2
-#potlatch2_key: ""
 # OAuth consumer key for the web site
 #oauth_key: ""
 # OAuth consumer key for iD
@@ -97,6 +95,9 @@ imagery_blacklist:
   - "http://xdworld\\.vworld\\.kr:8080/.*"
   # Blacklist here
   - ".*\\.here\\.com[/:].*"
+  # Blacklist Kanton SH and GL
+  - ".*wms.geo.sh.ch.*Luftbild_201[06].*"
+  - ".*wms.geo.gl.ch.*ch.gl.imagery.orthofoto201[357].*"
 # URL of Overpass instance to use for feature queries
 overpass_url: "https://overpass-api.de/api/interpreter"
 # Routing endpoints
@@ -126,3 +127,13 @@ csp_enforce: false
 storage_service: "local"
 # Root URL for storage service
 # storage_url:
+# URL for tile CDN
+#tile_cdn_url: ""
+# SMTP settings for outbound mail
+smtp_address: "localhost"
+smtp_port: 25
+smtp_domain: "localhost"
+smtp_enable_starttls_auto: false
+smtp_authentication: null
+smtp_user_name: null
+smtp_password: null