diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-11 17:32:33 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-11 17:32:33 +0000 |
| commit | 49f51ff1648612bd0f8bab797d94c399f2ed723c (patch) | |
| tree | dce681fc6c73c7eb988bb3c21b3746bc4c35abc9 /doc | |
| parent | d65e7aa9c80c4888e22710ce15fae47ce1cb4140 (diff) | |
| parent | 67aa0b8c4cbf762211ad178efb537f1649d91776 (diff) | |
| download | gitlab-ce-49f51ff1648612bd0f8bab797d94c399f2ed723c.tar.gz | |
Merge branch 'optimize_ldap' into 'master'
Optimize LDAP and add a search timeout
Related to #4282
This merge request arranges some things in `access.rb` to facilitate some optimizations in EE (to come later). It also adds a 10 second timeout to all LDAP searches so the entire worker is not blocked if some query doesn't return in a reasonable amount of time. This timeout is configurable per LDAP server.
See merge request !2267
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/integration/ldap.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/integration/ldap.md b/doc/integration/ldap.md index 845f588f913..f256477196b 100644 --- a/doc/integration/ldap.md +++ b/doc/integration/ldap.md @@ -48,6 +48,11 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server bind_dn: '_the_full_dn_of_the_user_you_will_bind_with' password: '_the_password_of_the_bind_user' + # Set a timeout, in seconds, for LDAP queries. This helps avoid blocking + # a request if the LDAP server becomes unresponsive. + # A value of 0 means there is no timeout. + timeout: 10 + # 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. |