summaryrefslogtreecommitdiff
path: root/doc/administration/auth
diff options
context:
space:
mode:
authorDrew Blessing <drew@gitlab.com>2016-09-29 14:08:27 -0500
committerDrew Blessing <drew@gitlab.com>2016-11-08 15:46:10 -0600
commitdc307830571aaca1ff20b409d7075eee83f21fb9 (patch)
treea71896f007ede5b1605132f112851d18115a426c /doc/administration/auth
parent8d0d8b91e46573e8fe46dc712e84c65708a00b97 (diff)
downloadgitlab-ce-dc307830571aaca1ff20b409d7075eee83f21fb9.tar.gz
Introduce better credential and error checking to `rake gitlab:ldap:check`
It was previously possible for invalid credential errors to go unnoticed in this task. Users would believe everything was configured correctly and then sign in would fail with 'invalid credentials'. This adds a specific bind check, plus catches errors connecting to the server. Also, specs :)
Diffstat (limited to 'doc/administration/auth')
-rw-r--r--doc/administration/auth/ldap.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md
index bf7814875bf..fd23047f027 100644
--- a/doc/administration/auth/ldap.md
+++ b/doc/administration/auth/ldap.md
@@ -35,6 +35,10 @@ of one hour.
To enable LDAP integration you need to add your LDAP server settings in
`/etc/gitlab/gitlab.rb` or `/home/git/gitlab/config/gitlab.yml`.
+There is a Rake task to check LDAP configuration. After configuring LDAP
+using the documentation below, see [LDAP check Rake task](../raketasks/check.md#ldap-check)
+for information on the LDAP check Rake task.
+
>**Note**: In GitLab EE, you can configure multiple LDAP servers to connect to
one GitLab server.