mastofe

commit: d9dc0fe84e1f7def5e7b423edbca6eeac6815f1c
parent: 55b56e3f95fc909def16fce9c6b9a799deac18b8
Author: James Moore <hello@jmoore.me>
Date:   Thu, 13 Apr 2017 10:51:49 -0700

smtp delivery type fix (#1556)

* delivery fix

# Conflicts:
#	config/environments/production.rb

* added stub in .env file

* reordered and added a comment

Diffstat:
M
.env.production.sample
1
+
M
config/environments/production.rb
3
++-

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.env.production.sample b/.env.production.sample
@@ -35,6 +35,7 @@ SMTP_PORT=587
 SMTP_LOGIN=
 SMTP_PASSWORD=
 SMTP_FROM_ADDRESS=notifications@example.com
+#SMTP_DELIVERY_METHOD=smtp # delivery method can also be sendmail
 #SMTP_AUTH_METHOD=plain
 #SMTP_OPENSSL_VERIFY_MODE=peer
 #SMTP_ENABLE_STARTTLS_AUTO=true
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -104,7 +104,8 @@ Rails.application.configure do
     :enable_starttls_auto => ENV['SMTP_ENABLE_STARTTLS_AUTO'] || true,
   }
 
-  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.delivery_method = ENV.fetch('SMTP_DELIVERY_METHOD', 'smtp').to_sym
+
 
   config.react.variant = :production