techhub/mastodon
2
0
Fork 0
Code Activity

Fix empty ENV variables not using default nil value (#27400)

Browse Source
This commit is contained in:
Renaud Chaput
2023-10-13 19:00:53 +02:00
committed by GitHub
parent 82beeb2f7e
commit e0da64bb4e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/initializers/devise.rb
View File

@@ -394,7 +394,7 @@ Devise.setup do |config|
config.check_at_sign = true
config.pam_default_suffix = ENV.fetch('PAM_EMAIL_DOMAIN') { ENV['LOCAL_DOMAIN'] }
config.pam_default_service = ENV.fetch('PAM_DEFAULT_SERVICE') { 'rpam' }
config.pam_controlled_service = ENV.fetch('PAM_CONTROLLED_SERVICE') { nil }
config.pam_controlled_service = ENV.fetch('PAM_CONTROLLED_SERVICE', nil).presence
end
if ENV['LDAP_ENABLED'] == 'true'