diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-08 15:08:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-08 15:08:54 +0300 |
| commit | 473b876fe3d7e0b36eb6268cc44a4fe0d94f4422 (patch) | |
| tree | 2f6d5f2ecad53015024b6b1509896f5933c5c3e6 /doc/administration/auth/smartcard.md | |
| parent | dca8df0c90d8727d69b3501b15b481546897f3cd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/auth/smartcard.md')
| -rw-r--r-- | doc/administration/auth/smartcard.md | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/doc/administration/auth/smartcard.md b/doc/administration/auth/smartcard.md index 5b6d299f171..0fa585bace5 100644 --- a/doc/administration/auth/smartcard.md +++ b/doc/administration/auth/smartcard.md @@ -115,7 +115,7 @@ more information, see [the relevant issue](https://gitlab.com/gitlab-org/gitlab/ ## Configure GitLab for smartcard authentication -**For Omnibus installations** +For Linux package installations: 1. Edit `/etc/gitlab/gitlab.rb`: @@ -140,9 +140,7 @@ more information, see [the relevant issue](https://gitlab.com/gitlab-org/gitlab/ 1. Save the file and [reconfigure](../restart_gitlab.md#omnibus-gitlab-reconfigure) GitLab for the changes to take effect. ---- - -**For installations from source** +For self-compiled installations: 1. Configure NGINX to request a client side certificate @@ -237,7 +235,7 @@ more information, see [the relevant issue](https://gitlab.com/gitlab-org/gitlab/ ### Additional steps when using SAN extensions -**For Omnibus installations** +For Linux package installations: 1. Add to `/etc/gitlab/gitlab.rb`: @@ -248,7 +246,7 @@ more information, see [the relevant issue](https://gitlab.com/gitlab-org/gitlab/ 1. Save the file and [reconfigure](../restart_gitlab.md#omnibus-gitlab-reconfigure) GitLab for the changes to take effect. -**For installations from source** +For self-compiled installations: 1. Add the `san_extensions` line to `config/gitlab.yml` within the smartcard section: @@ -267,7 +265,7 @@ more information, see [the relevant issue](https://gitlab.com/gitlab-org/gitlab/ ### Additional steps when authenticating against an LDAP server -**For Omnibus installations** +For Linux package installations: 1. Edit `/etc/gitlab/gitlab.rb`: @@ -284,7 +282,7 @@ more information, see [the relevant issue](https://gitlab.com/gitlab-org/gitlab/ 1. Save the file and [reconfigure](../restart_gitlab.md#omnibus-gitlab-reconfigure) GitLab for the changes to take effect. -**For installations from source** +For self-compiled installations: 1. Edit `config/gitlab.yml`: @@ -304,7 +302,7 @@ more information, see [the relevant issue](https://gitlab.com/gitlab-org/gitlab/ ### Require browser session with smartcard sign-in for Git access -**For Omnibus installations** +For Linux package installations: 1. Edit `/etc/gitlab/gitlab.rb`: @@ -315,7 +313,7 @@ more information, see [the relevant issue](https://gitlab.com/gitlab-org/gitlab/ 1. Save the file and [reconfigure](../restart_gitlab.md#omnibus-gitlab-reconfigure) GitLab for the changes to take effect. -**For installations from source** +For self-compiled installations: 1. Edit `config/gitlab.yml`: |