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

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index 6f77efcfd835ea3b83e00e6706225839b2ac2166..ffee16114b480275517fb1942a697a9825853f15 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -63,10 +63,6 @@ spam_threshold: 50
 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"
@@ -136,3 +132,8 @@ smtp_enable_starttls_auto: false
 smtp_authentication: null
 smtp_user_name: null
 smtp_password: null
+# Storage services
+avatar_storage: "local"
+trace_file_storage: "local"
+trace_image_storage: "local"
+trace_icon_storage: "local"