diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-09 16:39:19 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-09 16:39:19 +0300 |
| commit | 60569032658e93658f789f8bd8bbaef56ea39412 (patch) | |
| tree | 4b83f5448114c44daa8f4805ba737803bb1d52ca /doc | |
| parent | a3d9e4fd883005ef6a840701826e79f4abf2b637 (diff) | |
| parent | bd0c171c55d974887e598bc63b2625810629bea2 (diff) | |
Merge branch 'feature/log-ldap-to-application-log' into 'master'
Log LDAP blocking/unblocking events to application log
See merge request !8042
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/auth/ldap.md | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md index b8b63df091e..04723365277 100644 --- a/doc/administration/auth/ldap.md +++ b/doc/administration/auth/ldap.md @@ -298,8 +298,11 @@ LDAP server please double-check the LDAP `port` and `method` settings used by GitLab. Common combinations are `method: 'plain'` and `port: 389`, OR `method: 'ssl'` and `port: 636`. -### Login with valid credentials rejected +### Troubleshooting -If there is an unexpected error while authenticating the user with the LDAP -backend, the login is rejected and details about the error are logged to +If a user account is blocked or unblocked due to the LDAP configuration, a +message will be logged to `application.log`. + +If there is an unexpected error during an LDAP lookup (configuration error, +timeout), the login is rejected and a message will be logged to `production.log`. |