Merge branch 'master' into HEAD

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index 639910f4a001c5ef7b0e56d57767edf9312e2d64..2172d2d874d5fb40c83b0a47cbff37960e1f5128 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -65,9 +65,6 @@ spam_threshold: 50
 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
@@ -135,7 +132,8 @@ trace_icon_storage: "local"
 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