Commit cf42fa20 authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'fix/doc-administration-auth' into 'master'

Doc Consistency: administration/auth

See merge request gitlab-org/gitlab!69666
parents 0f9a7ab1 1d81b962
...@@ -336,7 +336,7 @@ Gitlab::Auth::Ldap::Person.find_by_uid('<uid>', adapter) ...@@ -336,7 +336,7 @@ Gitlab::Auth::Ldap::Person.find_by_uid('<uid>', adapter)
### Group memberships **(PREMIUM SELF)** ### Group memberships **(PREMIUM SELF)**
#### Membership(s) not granted **(PREMIUM SELF)** #### Membership(s) not granted
Sometimes you may think a particular user should be added to a GitLab group via Sometimes you may think a particular user should be added to a GitLab group via
LDAP group sync, but for some reason it's not happening. There are several LDAP group sync, but for some reason it's not happening. There are several
...@@ -395,7 +395,7 @@ group sync](#sync-all-groups) in the rails console and [look through the ...@@ -395,7 +395,7 @@ group sync](#sync-all-groups) in the rails console and [look through the
output](#example-console-output-after-a-group-sync) to see what happens when output](#example-console-output-after-a-group-sync) to see what happens when
GitLab syncs the `admin_group`. GitLab syncs the `admin_group`.
#### Sync all groups **(PREMIUM SELF)** #### Sync all groups
NOTE: NOTE:
To sync all groups manually when debugging is unnecessary, [use the Rake To sync all groups manually when debugging is unnecessary, [use the Rake
...@@ -413,7 +413,7 @@ LdapAllGroupsSyncWorker.new.perform ...@@ -413,7 +413,7 @@ LdapAllGroupsSyncWorker.new.perform
Next, [learn how to read the Next, [learn how to read the
output](#example-console-output-after-a-group-sync). output](#example-console-output-after-a-group-sync).
##### Example console output after a group sync **(PREMIUM SELF)** ##### Example console output after a group sync
Like the output from the user sync, the output from the [manual group Like the output from the user sync, the output from the [manual group
sync](#sync-all-groups) is also very verbose. However, it contains lots sync](#sync-all-groups) is also very verbose. However, it contains lots
...@@ -503,7 +503,7 @@ stating as such: ...@@ -503,7 +503,7 @@ stating as such:
No `admin_group` configured for 'ldapmain' provider. Skipping No `admin_group` configured for 'ldapmain' provider. Skipping
``` ```
#### Sync one group **(PREMIUM SELF)** #### Sync one group
[Syncing all groups](#sync-all-groups) can produce a lot of noise in the output, which can be [Syncing all groups](#sync-all-groups) can produce a lot of noise in the output, which can be
distracting when you're only interested in troubleshooting the memberships of distracting when you're only interested in troubleshooting the memberships of
...@@ -525,7 +525,7 @@ EE::Gitlab::Auth::Ldap::Sync::Group.execute_all_providers(group) ...@@ -525,7 +525,7 @@ EE::Gitlab::Auth::Ldap::Sync::Group.execute_all_providers(group)
The output is similar to The output is similar to
[that you get from syncing all groups](#example-console-output-after-a-group-sync). [that you get from syncing all groups](#example-console-output-after-a-group-sync).
#### Query a group in LDAP **(PREMIUM SELF)** #### Query a group in LDAP
When you'd like to confirm that GitLab can read a LDAP group and see all its members, When you'd like to confirm that GitLab can read a LDAP group and see all its members,
you can run the following: you can run the following:
......
...@@ -28,7 +28,7 @@ GitLab supports two authentication methods: ...@@ -28,7 +28,7 @@ GitLab supports two authentication methods:
### Authentication against a local database with X.509 certificates ### Authentication against a local database with X.509 certificates
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/726) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.6 as an experimental feature. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/726) in GitLab 11.6 as an experimental feature.
WARNING: WARNING:
Smartcard authentication against local databases may change or be removed completely in future Smartcard authentication against local databases may change or be removed completely in future
...@@ -55,7 +55,7 @@ Certificate: ...@@ -55,7 +55,7 @@ Certificate:
### Authentication against a local database with X.509 certificates and SAN extension ### Authentication against a local database with X.509 certificates and SAN extension
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/8605) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.3. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/8605) in GitLab 12.3.
Smartcards with X.509 certificates using SAN extensions can be used to authenticate Smartcards with X.509 certificates using SAN extensions can be used to authenticate
with GitLab. with GitLab.
...@@ -98,7 +98,7 @@ Certificate: ...@@ -98,7 +98,7 @@ Certificate:
### Authentication against an LDAP server ### Authentication against an LDAP server
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/7693) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.8 as an experimental feature. Smartcard authentication against an LDAP server may change or be removed completely in future releases. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/7693) in GitLab 11.8 as an experimental feature. Smartcard authentication against an LDAP server may change or be removed completely in the future.
GitLab implements a standard way of certificate matching following GitLab implements a standard way of certificate matching following
[RFC4523](https://tools.ietf.org/html/rfc4523). It uses the [RFC4523](https://tools.ietf.org/html/rfc4523). It uses the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment