diff options
| author | Drew Blessing <drew@gitlab.com> | 2015-12-31 13:22:51 -0600 |
|---|---|---|
| committer | Drew Blessing <drew@gitlab.com> | 2016-01-11 08:17:32 -0600 |
| commit | 67aa0b8c4cbf762211ad178efb537f1649d91776 (patch) | |
| tree | 8a2f7da423f4d1140bacb05bcd04eb19ad27e66a /doc | |
| parent | a9800ce40b7a80cbe779e3269c7eae83b883f4da (diff) | |
| download | gitlab-ce-67aa0b8c4cbf762211ad178efb537f1649d91776.tar.gz | |
Optimize LDAP and add a search timeout
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. |