From fac81dfc7fa8a4a2b2000648668b17a5cfabeacb Mon Sep 17 00:00:00 2001 From: James Smith Date: Wed, 15 Jan 2025 10:42:43 +0000 Subject: [PATCH] Load more SMTP settings from environment vars Ignoring SSL/TLS/STARTTLS for now, that should be fine left on auto these days. --- config/application.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config/application.rb b/config/application.rb index 3d1026c14..8ba008f1a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -59,10 +59,14 @@ module Manyfold config.action_mailer.smtp_settings = { address: ENV.fetch("SMTP_SERVER", nil), + port: ENV.fetch("SMTP_PORT", nil), + domain: ENV.fetch("SMTP_DOMAIN", nil), user_name: ENV.fetch("SMTP_USERNAME", nil), password: ENV.fetch("SMTP_PASSWORD", nil), - port: ENV.fetch("SMTP_PORT", nil), - openssl_verify_mode: (ENV.fetch("SMTP_VERIFY_SSL_MODE", nil) == "none") ? :none : nil + authentication: ENV.fetch("SMTP_AUTHENTICATION", nil)&.to_sym, + openssl_verify_mode: ENV.fetch("SMTP_OPENSSL_VERIFY_MODE", nil)&.to_sym, + open_timeout: ENV.fetch("SMTP_OPEN_TIMEOUT", nil)&.to_i, + read_timeout: ENV.fetch("SMTP_READ_TIMEOUT", nil)&.to_i }.compact # Load some feature settings from ENV