Add preproduction and production mailer configurations

AyuntamientoMadrid · Dec 20, 2017 · 96be6df · 96be6df
1 parent 7d2fee0
commit 96be6df
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/app/views/user_mailer/infringement_email.html.erb b/app/views/user_mailer/infringement_email.html.erb
@@ -1,4 +1,4 @@
-<%= t('mailer.infringement_email.link_html', link: @email.link) %>
+<%= t'mailer.infringement_email.link_html', link: @email.link if @email.link.present? %>
 
 <%= @email.description.html_safe %>
 <hr />

diff --git a/config/environments/preproduction.rb b/config/environments/preproduction.rb
@@ -62,7 +62,9 @@
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-  # config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.raise_delivery_errors = true
+  config.action_mailer.default_url_options = { host: Rails.application.secrets.server_name }
+  config.action_mailer.asset_host = "https://#{Rails.application.secrets.server_name}"
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -62,7 +62,9 @@
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-  # config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.raise_delivery_errors = true
+  config.action_mailer.default_url_options = { host: Rails.application.secrets.server_name }
+  config.action_mailer.asset_host = "https://#{Rails.application.secrets.server_name}"  
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).