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

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index 0ce0bf0b710ae04e7aceeb54cf02d2461bc218b5..049844d3d5b6a217fbf48fa7c46b6b860298c362 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -82,8 +82,6 @@ oauth_10_support: true
 nominatim_url: "https://nominatim.openstreetmap.org/"
 # Default editor
 default_editor: "id"
 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
 # OAuth consumer key for the web site
 #oauth_key: ""
 # OAuth consumer key for iD


@@ -131,3 +129,11 @@ storage_service: "local"
 # storage_url:
 # URL for tile CDN
 #tile_cdn_url: ""
 # 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