zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Fix `ENV` (#20377)

This commit is contained in:
Yamagishi Kazutoshi 2022-11-11 09:33:32 +09:00 committed by GitHub
parent d4f973227c
commit 19a8563905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/environments/production.rb
View File

@ -104,7 +104,7 @@ Rails.application.configure do
enable_starttls = nil enable_starttls = nil
enable_starttls_auto = nil enable_starttls_auto = nil
case env['SMTP_ENABLE_STARTTLS'] case ENV['SMTP_ENABLE_STARTTLS']
when 'always' when 'always'
enable_starttls = true enable_starttls = true
when 'never' when 'never'

2
lib/tasks/mastodon.rake
View File

@ -326,7 +326,7 @@ namespace :mastodon do
when 'auto' when 'auto'
enable_starttls_auto = true enable_starttls_auto = true
else else
enable_starttls_auto = ENV['SMTP_ENABLE_STARTTLS_AUTO'] != 'false' enable_starttls_auto = env['SMTP_ENABLE_STARTTLS_AUTO'] != 'false'
end end
ActionMailer::Base.smtp_settings = { ActionMailer::Base.smtp_settings = {