diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index c25c799d8f65ac2006c409f0023fd6b406485384..e23ff1f985bd66d0616d59b01f16f97878c0fbed 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -66,10 +66,11 @@ Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil? # backwards compatibility, we only have one host if Settings.ldap['enabled'] || Rails.env.test? if Settings.ldap['host'].present? + # We detected old LDAP configuration syntax. Update the config to make it + # look like it was entered with the new syntax. server = Settings.ldap.except('sync_time') - server['provider_name'] = 'ldapmain' Settings.ldap['servers'] = { - 'ldap' => server + 'main' => server } end