diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-01 07:04:08 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-01 07:04:08 +0000 |
| commit | 73b92f85bcd6c213b845cc997843a969cf0906cf (patch) | |
| tree | 15f5a46b4cc81c064d58d58b8fee38672721ea20 /config | |
| parent | 88d3e97e502f0be4f01fed100a06e04b2e0f2017 (diff) | |
| parent | f7aba277e7971668172196da74f946e5a48aabc3 (diff) | |
| download | gitlab-ce-73b92f85bcd6c213b845cc997843a969cf0906cf.tar.gz | |
Merge branch 'add_active_directory_ldap_option' into 'master'
Add active directory ldap option
Fixes #1557
See merge request !1139
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 6 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 93510356208..857643c006e 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -140,6 +140,12 @@ production: &base method: 'ssl' # "tls" or "ssl" or "plain" bind_dn: '_the_full_dn_of_the_user_you_will_bind_with' password: '_the_password_of_the_bind_user' + + # This setting specifies if LDAP server is Active Directory LDAP server. + # For non AD servers it skips the AD specific queries. + # If your LDAP server is not AD, set this to false. + active_directory: true + # If allow_username_or_email_login is enabled, GitLab will ignore everything # after the first '@' in the LDAP username submitted by the user on login. # diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index caf4ef25cdd..0d11ae6f33f 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -57,6 +57,7 @@ end Settings['ldap'] ||= Settingslogic.new({}) Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil? Settings.ldap['allow_username_or_email_login'] = false if Settings.ldap['allow_username_or_email_login'].nil? +Settings.ldap['active_directory'] = true if Settings.ldap['active_directory'].nil? Settings['omniauth'] ||= Settingslogic.new({}) |