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

This commit is contained in:
Tom Hughes 2019-01-28 19:04:02 +00:00
commit 3e7bc943fe
13 changed files with 249 additions and 157 deletions

View file

@ -60,6 +60,10 @@ defaults: &defaults
spam_threshold: 50
# 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
# https://github.com/openstreetmap/gpx-import
trace_use_job_queue: false
# Location of GPX traces and images
gpx_trace_dir: "/home/osm/traces"
gpx_image_dir: "/home/osm/images"