Drop customisation for Rails/ContentTag

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index 04ea9ba781a81a952b773f1da9fb468925c72032..6f77efcfd835ea3b83e00e6706225839b2ac2166 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -45,6 +45,8 @@ web_timeout: 30
 user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96, 168, 336, 731, 4383, 8766, 87660]
 # Rate limit for message sending
 max_messages_per_hour: 60
+# Rate limit for friending
+max_friends_per_hour: 60
 # Domain for handling message replies
 #messages_domain: "messages.openstreetmap.org"
 # Geonames authentication details
@@ -82,10 +84,8 @@ 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 application for the web site
+#oauth_application: ""
 # OAuth consumer key for iD
 #id_key: ""
 # Imagery to return in capabilities as blacklisted
@@ -97,9 +97,6 @@ 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