X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7fc2dbecd572718421d000441ccb305241e7d5ff..6bd6cbd2031e4dce3c81db3fc669dbc42978b225:/config/initializers/action_mailer.rb

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 27030d541..32dfa79bb 100644
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -1,6 +1,13 @@
-# Configure ActionMailer
+# Configure ActionMailer SMTP settings
 ActionMailer::Base.smtp_settings = {
-  :address  => "localhost",
-  :port  => 25, 
-  :domain  => 'localhost',
+  :address => "localhost",
+  :port => 25,
+  :domain => "localhost",
+  :enable_starttls_auto => false
+}
+
+# Set the host and protocol for all ActionMailer URLs
+ActionMailer::Base.default_url_options = {
+  :host => Settings.server_url,
+  :protocol => Settings.server_protocol
 }