X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e13337354d005d0fad1e6288ae98d2893a53e02d..da6604402153ee15e9df45516985c317cf069a6a:/config/initializers/action_mailer.rb

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 1467b6fe6..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
 }