diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-17 00:07:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-17 00:07:47 +0300 |
| commit | 2c34e41161b78fddbdff9a858086e95558e06ba0 (patch) | |
| tree | 7db8b02c06a3ee2319762c9417d37e81397a5d65 /doc/administration/operations | |
| parent | 5c4df0629a70c28eb479b513a3e6860e7a35d1c9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/operations')
| -rw-r--r-- | doc/administration/operations/fast_ssh_key_lookup.md | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/administration/operations/fast_ssh_key_lookup.md b/doc/administration/operations/fast_ssh_key_lookup.md index 4b7d7aaa479..1e887d8bd67 100644 --- a/doc/administration/operations/fast_ssh_key_lookup.md +++ b/doc/administration/operations/fast_ssh_key_lookup.md @@ -58,13 +58,15 @@ Fast lookup can be enabled with the following SSH servers: - [`gitlab-sshd`](gitlab_sshd.md) - OpenSSH -### `gitlab-sshd` +You can run both services simultaneously by using separate ports for each service. + +### With `gitlab-sshd` To set up `gitlab-sshd`, see [the `gitlab-sshd` documentation](gitlab_sshd.md). After `gitlab-sshd` is enabled, GitLab Shell and `gitlab-sshd` are configured to use fast lookup automatically. -### OpenSSH +### With OpenSSH WARNING: OpenSSH version 6.9+ is required because `AuthorizedKeysCommand` must be |