diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-21 03:12:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-21 03:12:56 +0300 |
| commit | 881c9469903d5520cd1d51b47f620856f30c253e (patch) | |
| tree | 968c9ca3de8dd2620a8dbecb7530e27cf88cf9ee /doc/administration/auth/ldap | |
| parent | 76365117183054e95bbb2f3a6392ac333628eacf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/auth/ldap')
| -rw-r--r-- | doc/administration/auth/ldap/index.md | 4 | ||||
| -rw-r--r-- | doc/administration/auth/ldap/ldap_synchronization.md | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/administration/auth/ldap/index.md b/doc/administration/auth/ldap/index.md index b773281b216..722bc25746b 100644 --- a/doc/administration/auth/ldap/index.md +++ b/doc/administration/auth/ldap/index.md @@ -468,7 +468,7 @@ If initially your LDAP configuration looked like: password: '123' ``` -1. Edit `/etc/gitlab/gitlab.rb` and remove the settings for `user_bn` and `password`. +1. Edit `/etc/gitlab/gitlab.rb` and remove the settings for `user_dn` and `password`. 1. [Reconfigure GitLab](../../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect. @@ -502,7 +502,7 @@ If initially your LDAP configuration looked like: password: '123' ``` -1. Edit `config/gitlab.yaml` and remove the settings for `user_bn` and `password`. +1. Edit `config/gitlab.yaml` and remove the settings for `user_dn` and `password`. 1. [Restart GitLab](../../restart_gitlab.md#installations-from-source) for the changes to take effect. diff --git a/doc/administration/auth/ldap/ldap_synchronization.md b/doc/administration/auth/ldap/ldap_synchronization.md index 3329ea8e9cc..0d6454fe108 100644 --- a/doc/administration/auth/ldap/ldap_synchronization.md +++ b/doc/administration/auth/ldap/ldap_synchronization.md @@ -347,3 +347,7 @@ These metrics are meant to provide a baseline and performance may vary based on any number of factors. This benchmark was extreme and most instances don't have near this many users or groups. Disk speed, database performance, network and LDAP server response time affects these metrics. + +## Troubleshooting + +See our [administrator guide to troubleshooting LDAP](ldap-troubleshooting.md). |