diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2014-09-30 12:07:31 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2014-09-30 12:07:31 +0200 |
| commit | f7aba277e7971668172196da74f946e5a48aabc3 (patch) | |
| tree | 85e122e4e562360b759c21f006a060e21d350f0f /config | |
| parent | 0c29cb3451414d21346894c140a17c53de6e1567 (diff) | |
| download | gitlab-ce-f7aba277e7971668172196da74f946e5a48aabc3.tar.gz | |
Add option to gitlab config to specify if LDAP server is active directory.
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 ad1db4b4f43..131b5d1238d 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({}) |