Merge pull request #972 from cantino/set_global_email_settings
local email was not configured correctly without this change
Andrew Cantino
1 changed files with 2 additions and 12 deletions
+ 2
- 12
config/initializers/action_mailer.rb
@@ -2,15 +2,5 @@ |
||
| 2 | 2 |
|
| 3 | 3 |
smtp_config = YAML::load(ERB.new(File.read(Rails.root.join('config', 'smtp.yml'))).result)
|
| 4 | 4 |
if smtp_config.keys.include? Rails.env |
| 5 |
- Huginn::Application.config.action_mailer.smtp_settings = smtp_config[Rails.env].symbolize_keys |
|
| 6 |
-end |
|
| 7 |
- |
|
| 8 |
-# Huginn::Application.config.action_mailer.smtp_settings = {
|
|
| 9 |
-# address: ENV['SMTP_SERVER'] || 'smtp.gmail.com', |
|
| 10 |
-# port: ENV['SMTP_PORT'] || 587, |
|
| 11 |
-# domain: ENV['SMTP_DOMAIN'], |
|
| 12 |
-# authentication: ENV['SMTP_AUTHENTICATION'] || 'plain', |
|
| 13 |
-# enable_starttls_auto: ENV['SMTP_ENABLE_STARTTLS_AUTO'] == 'true' ? true : false, |
|
| 14 |
-# user_name: ENV['SMTP_USER_NAME'], |
|
| 15 |
-# password: ENV['SMTP_PASSWORD'] |
|
| 16 |
-# } |
|
| 5 |
+ ActionMailer::Base.smtp_settings = smtp_config[Rails.env].symbolize_keys |
|
| 6 |
+end |