diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-15 15:32:40 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-15 15:32:40 +0200 |
| commit | 3f60b096b51b000905290d69ea05b874b60fa9e0 (patch) | |
| tree | 0b8c7011810b4a97523c2c63816735e519f0682c /config/environments | |
| parent | 7a23347db5be3f262dbcafbecf768588dc648bda (diff) | |
| parent | d9cad44ca54374cafa0c97775083bb1bc0a5a3ce (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `config/routes.rb`: Upstream disabled E2EE routes, which we did earlier, but slightly differently. Took upstream's version.
Diffstat (limited to 'config/environments')
| -rw-r--r-- | config/environments/production.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb index 00571a35a..c2e8210f8 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -99,6 +99,7 @@ Rails.application.configure do :openssl_verify_mode => ENV['SMTP_OPENSSL_VERIFY_MODE'], :enable_starttls_auto => ENV['SMTP_ENABLE_STARTTLS_AUTO'] || true, :tls => ENV['SMTP_TLS'].presence, + :ssl => ENV['SMTP_SSL'].presence, } config.action_mailer.delivery_method = ENV.fetch('SMTP_DELIVERY_METHOD', 'smtp').to_sym |