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

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index 5af1fb00d59963ae26f49a9a7372989127a4cabf..3aa1d96c75326de5d2c63d444996ea015100d8b5 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -42,27 +42,29 @@ api_timeout: 300
 # Timeout for web pages in seconds
 web_timeout: 30
 # Periods (in hours) which are allowed for user blocks
-user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96]
+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
 # Domain for handling message replies
 #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
 nearby_radius: 50
 # Spam threshold
 spam_threshold: 50
+# Delay diary entries from appearing in the feed for this many hours
+diary_feed_delay: 0
 # Default legale (jurisdiction location) for contributor terms
 default_legale: GB
 # Use the built-in jobs queue for importing traces
-# Leave as false if you are using the external high-speed gpx importer
+# Set to false if you are using the external high-speed gpx importer
 # https://github.com/openstreetmap/gpx-import
-trace_use_job_queue: false
+trace_use_job_queue: true
 # Location of GPX traces and images
 gpx_trace_dir: "/home/osm/traces"
 gpx_image_dir: "/home/osm/images"
@@ -120,3 +122,7 @@ fossgis_osrm_url: "https://routing.openstreetmap.de/"
 csp_enforce: false
 # URL for reporting Content-Security-Policy violations
 #csp_report_url: ""
+# Storage service to use in production mode
+storage_service: "local"
+# Root URL for storage service
+# storage_url: