fix: remove support for setting the 'ssl' option for app-level smtp use

This commit is contained in:
Adam Cooke
2024-03-04 15:54:54 +00:00
parent 1ca18dbc6e
commit 658aa71483
4 changed files with 1 additions and 10 deletions
+1 -2
View File
@@ -13,6 +13,5 @@ ActionMailer::Base.smtp_settings = {
authentication: config.authentication_type&.to_sym, authentication: config.authentication_type&.to_sym,
enable_starttls: config.enable_starttls?, enable_starttls: config.enable_starttls?,
enable_starttls_auto: config.enable_starttls_auto?, enable_starttls_auto: config.enable_starttls_auto?,
openssl_verify_mode: config.openssl_verify_mode, openssl_verify_mode: config.openssl_verify_mode
ssl: config.ssl?
} }
-1
View File
@@ -74,7 +74,6 @@ This document contains all the environment variables which are available for thi
| `SMTP_ENABLE_STARTTLS` | Boolean | Use STARTTLS when connecting to the SMTP server and fail if unsupported | false | | `SMTP_ENABLE_STARTTLS` | Boolean | Use STARTTLS when connecting to the SMTP server and fail if unsupported | false |
| `SMTP_ENABLE_STARTTLS_AUTO` | Boolean | Detects if STARTTLS is enabled in the SMTP server and starts to use it | true | | `SMTP_ENABLE_STARTTLS_AUTO` | Boolean | Detects if STARTTLS is enabled in the SMTP server and starts to use it | true |
| `SMTP_OPENSSL_VERIFY_MODE` | String | When using TLS, you can set how OpenSSL checks the certificate. Use 'none' for no certificate checking | peer | | `SMTP_OPENSSL_VERIFY_MODE` | String | When using TLS, you can set how OpenSSL checks the certificate. Use 'none' for no certificate checking | peer |
| `SMTP_SSL` | Boolean | Use an SSL/TLS connection to the SMTP server (SMTPS) | false |
| `SMTP_FROM_NAME` | String | The name to use as the from name outgoing emails from Postal | Postal | | `SMTP_FROM_NAME` | String | The name to use as the from name outgoing emails from Postal | Postal |
| `SMTP_FROM_ADDRESS` | String | The e-mail to use as the from address outgoing emails from Postal | postal@example.com | | `SMTP_FROM_ADDRESS` | String | The e-mail to use as the from address outgoing emails from Postal | postal@example.com |
| `RAILS_ENVIRONMENT` | String | The Rails environment to run the application in | production | | `RAILS_ENVIRONMENT` | String | The Rails environment to run the application in | production |
-2
View File
@@ -161,8 +161,6 @@ smtp:
enable_starttls_auto: true enable_starttls_auto: true
# When using TLS, you can set how OpenSSL checks the certificate. Use 'none' for no certificate checking # When using TLS, you can set how OpenSSL checks the certificate. Use 'none' for no certificate checking
openssl_verify_mode: peer openssl_verify_mode: peer
# Use an SSL/TLS connection to the SMTP server (SMTPS)
ssl: false
# The name to use as the from name outgoing emails from Postal # The name to use as the from name outgoing emails from Postal
from_name: Postal from_name: Postal
# The e-mail to use as the from address outgoing emails from Postal # The e-mail to use as the from address outgoing emails from Postal
-5
View File
@@ -380,11 +380,6 @@ module Postal
default "peer" default "peer"
end end
boolean :ssl do
description "Use an SSL/TLS connection to the SMTP server (SMTPS)"
default false
end
string :from_name do string :from_name do
description "The name to use as the from name outgoing emails from Postal" description "The name to use as the from name outgoing emails from Postal"
default "Postal" default "Postal"