Refactor the account edit/update pages out into a separate accounts controller

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index 049844d3d5b6a217fbf48fa7c46b6b860298c362..801e8f2d1328045a0629870cd385aaf4afbc526a 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
 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
 # Domain for handling message replies
 #messages_domain: "messages.openstreetmap.org"
 # Geonames authentication details


@@ -61,10 +63,6 @@ spam_threshold: 50
 diary_feed_delay: 0
 # Default legale (jurisdiction location) for contributor terms
 default_legale: GB
 diary_feed_delay: 0
 # Default legale (jurisdiction location) for contributor terms
 default_legale: GB

-# Use the built-in jobs queue for importing traces
-# Set to false if you are using the external high-speed gpx importer
-# https://github.com/openstreetmap/gpx-import
-trace_use_job_queue: true

 # Location of GPX traces and images
 gpx_trace_dir: "/home/osm/traces"
 gpx_image_dir: "/home/osm/images"
 # Location of GPX traces and images
 gpx_trace_dir: "/home/osm/traces"
 gpx_image_dir: "/home/osm/images"


@@ -82,8 +80,8 @@ oauth_10_support: true
 nominatim_url: "https://nominatim.openstreetmap.org/"
 # Default editor
 default_editor: "id"
 nominatim_url: "https://nominatim.openstreetmap.org/"
 # Default editor
 default_editor: "id"

-# 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
 # OAuth consumer key for iD
 #id_key: ""
 # Imagery to return in capabilities as blacklisted


@@ -95,9 +93,6 @@ imagery_blacklist:
   - "http://xdworld\\.vworld\\.kr:8080/.*"
   # Blacklist here
   - ".*\\.here\\.com[/:].*"
   - "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
 # URL of Overpass instance to use for feature queries
 overpass_url: "https://overpass-api.de/api/interpreter"
 # Routing endpoints