Move the default_url_options config to the action_mailer initializer

We can't use Rails.application.config here because the initializers
run after ActionMailer::Base has been set up.

diff --git a/config/application.rb b/config/application.rb
index 3220ab5916fea0717ca2316debb051d9496ef590..b6e2ba46788c14d6342e934f31a0364b9e83c43c 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -43,8 +43,5 @@ module OpenStreetMap
       config.logstasher.logger_path = LOGSTASH_PATH
       config.logstasher.log_controller_parameters = true
     end
-
-    # Set the host and protocol for all action mailer urls
-    config.action_mailer.default_url_options = { :host => SERVER_URL, :protocol => SERVER_PROTOCOL }
   end
 end

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 6b27bb686fdd348f483e6aeb22ee48c19d0c81ee..021a4c25d269f8fe62c509527ba688b6100ec281 100644 (file)
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -5,3 +5,6 @@ ActionMailer::Base.smtp_settings = {
   :domain => "localhost",
   :enable_starttls_auto => false
 }
+
+# Set the host and protocol for all action mailer urls
+ActionMailer::Base.default_url_options = { :host => SERVER_URL, :protocol => SERVER_PROTOCOL }