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

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index e6b156e28fd3e5f59cdad374b900427357f3b03c..2172d2d874d5fb40c83b0a47cbff37960e1f5128 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -31,6 +31,8 @@ tracepoints_per_page: 5000
 max_number_of_nodes: 50000
 # Maximum number of nodes that can be in a way (checked on save)
 max_number_of_way_nodes: 2000
 max_number_of_nodes: 50000
 # Maximum number of nodes that can be in a way (checked on save)
 max_number_of_way_nodes: 2000

+# Maximum number of members that can be in a relation (checked on save)
+max_number_of_relation_members: 32000

 # The maximum area you're allowed to request notes from, in square degrees
 max_note_request_area: 25
 # Zoom level to use for postcode results from the geocoder
 # The maximum area you're allowed to request notes from, in square degrees
 max_note_request_area: 25
 # Zoom level to use for postcode results from the geocoder


@@ -63,9 +65,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

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

 # Location of data for attachments
 attachments_dir: ":rails_root/public/attachments"
 # Log file to use
 # Location of data for attachments
 attachments_dir: ":rails_root/public/attachments"
 # Log file to use


@@ -133,7 +132,8 @@ trace_icon_storage: "local"
 smtp_address: "localhost"
 smtp_port: 25
 smtp_domain: "localhost"
 smtp_address: "localhost"
 smtp_port: 25
 smtp_domain: "localhost"

-smtp_enable_starttls_auto: false
+smtp_enable_starttls_auto: true
+smtp_tls_verify_mode: "none"

 smtp_authentication: null
 smtp_user_name: null
 smtp_password: null
 smtp_authentication: null
 smtp_user_name: null
 smtp_password: null