Expose the rest of Action Mailer's config

SeaGL · Aug 16, 2024 · a5b4894 · a5b4894
1 parent e5122f2
commit a5b4894
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -102,8 +102,12 @@
     password:             ENV.fetch('OSEM_SMTP_PASSWORD', nil),
     authentication:       ENV.fetch('OSEM_SMTP_AUTHENTICATION', 'plain').try(:to_sym),
     domain:               ENV.fetch('OSEM_SMTP_DOMAIN', nil),
+    enable_starttls:      ENV.fetch('OSEM_SMTP_ENABLE_STARTTLS', nil),
     enable_starttls_auto: ENV.fetch('OSEM_SMTP_ENABLE_STARTTLS_AUTO', nil),
-    openssl_verify_mode:  ENV.fetch('OSEM_SMTP_OPENSSL_VERIFY_MODE', nil)
+    openssl_verify_mode:  ENV.fetch('OSEM_SMTP_OPENSSL_VERIFY_MODE', nil),
+    tls:                  ENV['OSEM_SMTP_TLS'].present?,
+    open_timeout:         ENV.fetch('OSEM_SMTP_OPEN_TIMEOUT', nil),
+    read_timeout:         ENV.fetch('OSEM_SMTP_READ_TIMEOUT', nil)
   }.compact
 
   # Use memcache cluster as cache store in production

diff --git a/dotenv.example b/dotenv.example
@@ -91,8 +91,10 @@
 # OSEM_SMTP_USERNAME=user1
 # OSEM_SMTP_PASSWORD=password123
 # OSEM_SMTP_AUTHENTICATION=plain
+# OSEM_SMTP_ENABLE_STARTTLS=false
 # OSEM_SMTP_ENABLE_STARTTLS_AUTO=true
 # OSEM_SMTP_OPENSSL_VERIFY_MODE=peer
+# OSEM_SMTP_TLS=false
 
 # Enable the usage of the devise ichain plugin
 # OSEM_ICHAIN_ENABLED=false