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

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index a664b78b0f883fe4cf15d23f14ae26688f22be5b..3dd73297220e15b138482854559e424912372550 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -49,8 +49,8 @@ max_messages_per_hour: 60
 #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
@@ -82,8 +82,6 @@ oauth_10_support: true
 nominatim_url: "https://nominatim.openstreetmap.org/"
 # Default editor
 default_editor: "id"
-# OAuth consumer key for Potlatch 2
-#potlatch2_key: ""
 # OAuth consumer key for the web site
 #oauth_key: ""
 # OAuth consumer key for iD
@@ -122,3 +120,17 @@ 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:
+# URL for tile CDN
+#tile_cdn_url: ""
+# SMTP settings for outbound mail
+smtp_address: "localhost"
+smtp_port: 25
+smtp_domain: "localhost"
+smtp_enable_starttls_auto: false
+smtp_authentication: null
+smtp_user_name: null
+smtp_password: null