diff options
| author | Michael Kozono <mkozono@gmail.com> | 2017-08-17 15:05:56 -0700 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2017-08-17 16:00:07 -0700 |
| commit | 1c3a2bc38987a659319314953a1a90263e329c3b (patch) | |
| tree | c7f8a59bc2770d4d7df05afeb6f38856893a2b19 /config | |
| parent | f3203cbbc25586df622552153cc460d2f79f414e (diff) | |
| download | gitlab-ce-1c3a2bc38987a659319314953a1a90263e329c3b.tar.gz | |
Setup LDAP settings properly
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 38ade18bdc0..5de46eddab6 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -139,6 +139,8 @@ if Settings.ldap['enabled'] || Rails.env.test? end Settings.ldap['servers'].each do |key, server| + server = Settingslogic.new(server) + server['label'] ||= 'LDAP' server['timeout'] ||= 10.seconds server['block_auto_created_users'] = false if server['block_auto_created_users'].nil? @@ -165,6 +167,8 @@ if Settings.ldap['enabled'] || Rails.env.test? MSG Rails.logger.warn(message) end + + Settings.ldap['servers'][key] = server end end |