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

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index e8db6f81818653993c1d98577b8b863ef133c089..09672c2c3a6565748d89be6f375055dbf99b9a0b 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: []
+# 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
@@ -93,6 +95,7 @@ imagery_blacklist:
   - ".*\\.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/"
@@ -136,3 +139,5 @@ smtp_tls_verify_mode: "none"
 smtp_authentication: null
 smtp_user_name: null
 smtp_password: null
+# Matomo settings for analytics
+#matomo: