smtp delivery type fix (#1556)

* delivery fix

# Conflicts:
#	config/environments/production.rb

* added stub in .env file

* reordered and added a comment

diff --git a/.env.production.sample b/.env.production.sample
index 97bba5e3f072e3ed3f54da37e05911b7d20e985a..7c82c014e07cd45193f614bb5d419c0468a79dcd 100644 (file)
--- 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
index 37a10fd4dd11dd04673e9515dbae7041f7461d2a..0b0ae29c8d877805ff3a4425447222d684eb1c06 100644 (file)
--- 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