diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-16 13:42:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-16 13:42:19 +0300 |
| commit | 84d1bd786125c1c14a3ba5f63e38a4cc736a9027 (patch) | |
| tree | f550fa965f507077e20dbb6d61a8269a99ef7107 /doc/administration/auth/ldap | |
| parent | 3a105e36e689f7b75482236712f1a47fd5a76814 (diff) | |
Add latest changes from gitlab-org/gitlab@16-8-stable-eev16.8.0-rc42
Diffstat (limited to 'doc/administration/auth/ldap')
| -rw-r--r-- | doc/administration/auth/ldap/index.md | 3 | ||||
| -rw-r--r-- | doc/administration/auth/ldap/ldap-troubleshooting.md | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/doc/administration/auth/ldap/index.md b/doc/administration/auth/ldap/index.md index 62395ebdcd2..49841b5e1be 100644 --- a/doc/administration/auth/ldap/index.md +++ b/doc/administration/auth/ldap/index.md @@ -1210,10 +1210,9 @@ For more information on synchronizing users and groups between LDAP and GitLab, ## Move from LDAP to SAML -1. [Configure SAML](../../../integration/saml.md). Add `auto_link_ldap_user` to: +1. [Add SAML configuration](../../../integration/saml.md) to: - [`gitlab.rb` for Linux package installations](../../../integration/saml.html?tab=Linux+package+%28Omnibus%29). - [`values.yml` for Helm chart installations](../../../integration/saml.html?tab=Helm+chart+%28Kubernetes%29). - For more information, see the [initial settings for all providers](../../../integration/omniauth.md#configure-initial-settings). 1. Optional. [Disable the LDAP auth from the sign-in page](#disable-ldap-web-sign-in). diff --git a/doc/administration/auth/ldap/ldap-troubleshooting.md b/doc/administration/auth/ldap/ldap-troubleshooting.md index 9cd306d979f..eb1ee203469 100644 --- a/doc/administration/auth/ldap/ldap-troubleshooting.md +++ b/doc/administration/auth/ldap/ldap-troubleshooting.md @@ -774,10 +774,10 @@ If a connection can't be established, it is likely either because of a problem with your configuration or a firewall blocking the connection. - Ensure you don't have a firewall blocking the -connection, and that the LDAP server is accessible to the GitLab host. + connection, and that the LDAP server is accessible to the GitLab host. - Look for an error message in the Rake check output, which may lead to your LDAP configuration to -confirm that the configuration values (specifically `host`, `port`, `bind_dn`, and -`password`) are correct. + confirm that the configuration values (specifically `host`, `port`, `bind_dn`, and + `password`) are correct. - Look for [errors](#connection) in [the logs](#gitlab-logs) to further debug connection failures. If GitLab can successfully connect to LDAP but doesn't return any |