Merge pull request #3864 from ZhengLin-Li/patch-1

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index 2172d2d874d5fb40c83b0a47cbff37960e1f5128..6e3f431f754b1b8c90ce3fc46b0f33c63562c220 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -73,6 +73,8 @@ attachments_dir: ":rails_root/public/attachments"
 #logstash_path: ""
 # List of memcache servers to use for caching
 #memcache_servers: []
 #logstash_path: ""
 # List of memcache servers to use for caching
 #memcache_servers: []

+# Enable HTTP basic authentication support
+basic_auth_support: true

 # Enable legacy OAuth 1.0 support
 oauth_10_support: true
 # URL of Nominatim instance to use for geocoding
 # Enable legacy OAuth 1.0 support
 oauth_10_support: true
 # URL of Nominatim instance to use for geocoding


@@ -81,22 +83,23 @@ nominatim_url: "https://nominatim.openstreetmap.org/"
 default_editor: "id"
 # OAuth application for the web site
 #oauth_application: ""
 default_editor: "id"
 # OAuth application for the web site
 #oauth_application: ""

-# OAuth consumer key for iD
-#id_key: ""
+# OAuth application for iD
+#id_application: ""

 # Imagery to return in capabilities as blacklisted
 imagery_blacklist:
   # Current Google imagery URLs have google or googleapis in the domain
 # Imagery to return in capabilities as blacklisted
 imagery_blacklist:
   # 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}.*"
+  - ".*\\.google(apis)?\\..*/.*"

   # Blacklist VWorld
   - "http://xdworld\\.vworld\\.kr:8080/.*"
   # Blacklist here
   - ".*\\.here\\.com[/:].*"
 # URL of Overpass instance to use for feature queries
 overpass_url: "https://overpass-api.de/api/interpreter"
   # Blacklist VWorld
   - "http://xdworld\\.vworld\\.kr:8080/.*"
   # Blacklist here
   - ".*\\.here\\.com[/:].*"
 # URL of Overpass instance to use for feature queries
 overpass_url: "https://overpass-api.de/api/interpreter"

+overpass_credentials: false

 # Routing endpoints
 graphhopper_url: "https://graphhopper.com/api/1/route"
 fossgis_osrm_url: "https://routing.openstreetmap.de/"
 # Routing endpoints
 graphhopper_url: "https://graphhopper.com/api/1/route"
 fossgis_osrm_url: "https://routing.openstreetmap.de/"

+fossgis_valhalla_url: "https://valhalla1.openstreetmap.de/route"

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


@@ -137,3 +140,5 @@ smtp_tls_verify_mode: "none"
 smtp_authentication: null
 smtp_user_name: null
 smtp_password: null
 smtp_authentication: null
 smtp_user_name: null
 smtp_password: null

+# Matomo settings for analytics
+#matomo: