Merge branch '15881-ldap'

refs #15881

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

diff --cc lib/config/config.default.yml
Simple merge

diff --cc lib/config/deprecated.go
Simple merge

diff --cc lib/config/deprecated_test.go
Simple merge

diff --cc lib/config/generated_config.go
Simple merge

diff --cc sdk/go/arvados/config.go
Simple merge

diff --cc services/api/config/initializers/omniauth_init.rb
index 35a318b94fe1f5bf4bc822f06608c8b031854a1e,5557be1dcdb1502ed51df7b5b0f9de7854a9a1f3..a1b2356bd56242389cff2dac821ad7d68f103177
--- 1/services/api/config/initializers/omniauth_init.rb
--- 2/services/api/config/initializers/omniauth_init.rb
+++ b/services/api/config/initializers/omniauth_init.rb
@@@ -9,9 -9,9 +9,9 @@@
  
  if defined? CUSTOM_PROVIDER_URL
    Rails.logger.warn "Copying omniauth from globals in legacy config file."
-   Rails.configuration.Login["ProviderAppID"] = APP_ID
-   Rails.configuration.Login["ProviderAppSecret"] = APP_SECRET
+   Rails.configuration.Login["SSO"]["ProviderAppID"] = APP_ID
+   Rails.configuration.Login["SSO"]["ProviderAppSecret"] = APP_SECRET
 -  Rails.configuration.Services["SSO"]["ExternalURL"] = CUSTOM_PROVIDER_URL
 +  Rails.configuration.Services["SSO"]["ExternalURL"] = CUSTOM_PROVIDER_URL.sub(/\/$/, "") + "/"
  else
    Rails.application.config.middleware.use OmniAuth::Builder do
      provider(:josh_id,