X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9ced230fe1cdd18190c4a296d0cc2293bfb1980a..bd1420a7c51b7d1c3a64bc02756393c7ad2025f5:/config/initializers/action_mailer.rb?ds=inline diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb index 54da28139..e15aaad49 100644 --- a/config/initializers/action_mailer.rb +++ b/config/initializers/action_mailer.rb @@ -1,13 +1,16 @@ # 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 ActionMailer::Base.default_url_options = { - :host => SERVER_URL, - :protocol => SERVER_PROTOCOL + :host => Settings.server_url, + :protocol => Settings.server_protocol }