mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-02-20 14:54:15 +01:00
Merge pull request #359 from trombik/issue_354
bugfix: introduce SMTP_CA_FILE and SMTP_CA_PATH
This commit is contained in:
commit
9abfe24660
@ -77,7 +77,9 @@ Rails.application.configure do
|
||||
authentication: Rails.application.secrets.smtp_authentication,
|
||||
enable_starttls_auto: Rails.application.secrets.smtp_enable_starttls_auto,
|
||||
openssl_verify_mode: Rails.application.secrets.smtp_openssl_verify_mode,
|
||||
tls: Rails.application.secrets.smtp_tls
|
||||
tls: Rails.application.secrets.smtp_tls,
|
||||
ca_file: Rails.application.secrets.smtp_ca_file,
|
||||
ca_path: Rails.application.secrets.smtp_ca_path
|
||||
}
|
||||
# use :smtp for switch prod
|
||||
config.action_mailer.delivery_method = Rails.application.secrets.delivery_method.to_sym
|
||||
|
@ -137,6 +137,8 @@ production:
|
||||
smtp_enable_starttls_auto: <%= ENV["SMTP_ENABLE_STARTTLS_AUTO"] %>
|
||||
smtp_openssl_verify_mode: <%= ENV["SMTP_OPENSSL_VERIFY_MODE"] %>
|
||||
smtp_tls: <%= ENV["SMTP_TLS"] %>
|
||||
smtp_ca_file: <%= ENV.fetch("SMTP_CA_FILE", nil) %>
|
||||
smtp_ca_path: <%= ENV.fetch("SMTP_CA_PATH", nil) %>
|
||||
week_starting_day: <%= ENV["WEEK_STARTING_DAY"] %>
|
||||
d3_date_format: <%= ENV.fetch("D3_DATE_FORMAT", '%y-%m-%d').dump %>
|
||||
uib_date_format: <%= ENV["UIB_DATE_FORMAT"] %>
|
||||
|
@ -64,6 +64,24 @@ See http://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-config
|
||||
|
||||
When DELIVERY_METHOD is set to **smtp**, configure the SMTP server parameters.
|
||||
See https://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration for more details.
|
||||
<a name="SMTP_CA_FILE"></a>
|
||||
|
||||
SMTP_CA_FILE
|
||||
|
||||
The path to a file containing a PEM-format CA certificate.
|
||||
See [OpenSSL::SSL::SSLContext](https://ruby-doc.org/stdlib-2.6/libdoc/openssl/rdoc/OpenSSL/SSL/SSLContext.html).
|
||||
This is an undocumented setting of [mail gem](https://github.com/mikel/mail).
|
||||
<a name="SMTP_CA_PATH"></a>
|
||||
|
||||
SMTP_CA_PATH
|
||||
|
||||
The path to a directory containing CA certificates in PEM format.
|
||||
See [OpenSSL::SSL::SSLContext](https://ruby-doc.org/stdlib-2.6/libdoc/openssl/rdoc/OpenSSL/SSL/SSLContext.html).
|
||||
This is an undocumented setting of [mail gem](https://github.com/mikel/mail).
|
||||
<a name="SMTP_TLS"></a>
|
||||
|
||||
SMTP_TLS
|
||||
Enables the SMTP connection to use SMTP/TLS (SMTPS: SMTP over direct TLS connection).
|
||||
<a name="DEFAULT_HOST"></a><a name="DEFAULT_PROTOCOL"></a>
|
||||
|
||||
DEFAULT_HOST, DEFAULT_PROTOCOL
|
||||
|
Loading…
x
Reference in New Issue
Block a user