diff --git a/config/initializers/smtp.rb b/config/initializers/smtp.rb index 53f2d00..3f2e28f 100644 --- a/config/initializers/smtp.rb +++ b/config/initializers/smtp.rb @@ -13,6 +13,5 @@ ActionMailer::Base.smtp_settings = { authentication: config.authentication_type&.to_sym, enable_starttls: config.enable_starttls?, enable_starttls_auto: config.enable_starttls_auto?, - openssl_verify_mode: config.openssl_verify_mode, - ssl: config.ssl? + openssl_verify_mode: config.openssl_verify_mode } diff --git a/doc/config/environment-variables.md b/doc/config/environment-variables.md index 57873c0..5763504 100644 --- a/doc/config/environment-variables.md +++ b/doc/config/environment-variables.md @@ -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_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_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_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 | diff --git a/doc/config/yaml.yml b/doc/config/yaml.yml index 82eb582..5efb28f 100644 --- a/doc/config/yaml.yml +++ b/doc/config/yaml.yml @@ -161,8 +161,6 @@ smtp: enable_starttls_auto: true # When using TLS, you can set how OpenSSL checks the certificate. Use 'none' for no certificate checking 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 from_name: Postal # The e-mail to use as the from address outgoing emails from Postal diff --git a/lib/postal/config_schema.rb b/lib/postal/config_schema.rb index 42a547c..e5424fd 100644 --- a/lib/postal/config_schema.rb +++ b/lib/postal/config_schema.rb @@ -380,11 +380,6 @@ module Postal default "peer" end - boolean :ssl do - description "Use an SSL/TLS connection to the SMTP server (SMTPS)" - default false - end - string :from_name do description "The name to use as the from name outgoing emails from Postal" default "Postal"