From 7b0de13c618dae07d77667b4c23c435df5737ef8 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 25 Nov 2020 16:12:07 +0000 Subject: [PATCH] Allow smtp settings to be configured through the settings system This allows easier configuration using the settings.local.yml files Fixes #2571 --- config/initializers/action_mailer.rb | 11 +++++++---- config/settings.yml | 8 ++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb index 32dfa79bbf..e15aaad496 100644 --- a/config/initializers/action_mailer.rb +++ b/config/initializers/action_mailer.rb @@ -1,9 +1,12 @@ # Configure ActionMailer SMTP settings ActionMailer::Base.smtp_settings = { - :address => "localhost", - :port => 25, - :domain => "localhost", - :enable_starttls_auto => false + :address => Settings.smtp_address, + :port => Settings.smtp_port, + :domain => Settings.smtp_domain, + :enable_starttls_auto => Settings.smtp_enable_starttls_auto, + :authentication => Settings.smtp_authentication, + :user_name => Settings.smtp_user_name, + :password => Settings.smtp_password } # Set the host and protocol for all ActionMailer URLs diff --git a/config/settings.yml b/config/settings.yml index 0ce0bf0b71..04ea9ba781 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -131,3 +131,11 @@ storage_service: "local" # 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