aboutsummaryrefslogtreecommitdiffstats
path: root/config/environments
diff options
context:
space:
mode:
authorCaleb <caleb.tutty@nzherald.co.nz>2015-04-09 14:15:47 +1200
committerCaleb <caleb.tutty@nzherald.co.nz>2015-04-09 14:15:47 +1200
commitf47a7d6668b43b2e5a49405b4b55aa5891d1b2ff (patch)
tree3af891627b59fe3c7a233e5eb2b5bf27f42ea397 /config/environments
parentd2fd05bb203466187ec87479f78792f3e047ff45 (diff)
Allow configuration for SMTP settings
Diffstat (limited to 'config/environments')
-rw-r--r--config/environments/production.rb15
1 files changed, 14 insertions, 1 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb
index a3e3cebd2..daa16bcef 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -17,7 +17,20 @@ Alaveteli::Application.configure do
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
- config.action_mailer.delivery_method = :sendmail # so is queued, rather than giving immediate errors
+
+ config.action_mailer.delivery_method = AlaveteliConfiguration::mailer_delivery_method.to_sym
+
+ if AlaveteliConfiguration::mailer_delivery_method.to_sym == :smtp
+ config.action_mailer.smtp_settings = {
+ :address => AlaveteliConfiguration::mailer_address,
+ :port => AlaveteliConfiguration.mailer_port,
+ :domain => AlaveteliConfiguration.mailer_domain,
+ :user_name => AlaveteliConfiguration.mailer_user_name,
+ :password => AlaveteliConfiguration.mailer_password,
+ :authentication => AlaveteliConfiguration.mailer_authentication,
+ :enable_starttls_auto => AlaveteliConfiguration.mailer_enable_starttls_auto
+ }
+ end
config.active_support.deprecation = :notify