diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-17 15:09:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-17 15:09:15 +0300 |
commit | cd92e0ff989f38f028fd3ee8d27e0fb1d21f7362 (patch) | |
tree | b27854c43f5f5c4a0e71fc6c756b83c55ae543b4 /doc/administration/gitaly | |
parent | d0ed973bd7c3a5c79c2bf9673d9d7260f91dd961 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/gitaly')
-rw-r--r-- | doc/administration/gitaly/configure_gitaly.md | 20 | ||||
-rw-r--r-- | doc/administration/gitaly/praefect.md | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/doc/administration/gitaly/configure_gitaly.md b/doc/administration/gitaly/configure_gitaly.md index 2a91fa40a81..b26ae84eef0 100644 --- a/doc/administration/gitaly/configure_gitaly.md +++ b/doc/administration/gitaly/configure_gitaly.md @@ -19,7 +19,7 @@ Configure Gitaly in one of two ways: :::TabTitle Self-compiled (source) 1. Edit `/home/git/gitaly/config.toml` and add or change the [Gitaly settings](https://gitlab.com/gitlab-org/gitaly/blob/master/config.toml.example). -1. Save the file and [restart GitLab](../restart_gitlab.md#installations-from-source). +1. Save the file and [restart GitLab](../restart_gitlab.md#self-compiled-installations). ::EndTabs @@ -183,7 +183,7 @@ Edit `/etc/gitlab/gitlab.rb`: token: 'abc123secret' ``` -1. Save the file and [restart GitLab](../restart_gitlab.md#installations-from-source). +1. Save the file and [restart GitLab](../restart_gitlab.md#self-compiled-installations). 1. On the Gitaly servers, edit `/home/git/gitaly/config.toml`: ```toml @@ -191,7 +191,7 @@ Edit `/etc/gitlab/gitlab.rb`: token = 'abc123secret' ``` -1. Save the file and [restart GitLab](../restart_gitlab.md#installations-from-source). +1. Save the file and [restart GitLab](../restart_gitlab.md#self-compiled-installations). ::EndTabs @@ -351,7 +351,7 @@ Configure Gitaly server in one of two ways: gitlab_url: https://gitlab.example.com ``` -1. Save the files and [restart GitLab](../restart_gitlab.md#installations-from-source). +1. Save the files and [restart GitLab](../restart_gitlab.md#self-compiled-installations). 1. Confirm that Gitaly can perform callbacks to the GitLab internal API: - For GitLab 15.3 and later, run `sudo /opt/gitlab/embedded/bin/gitaly check /var/opt/gitlab/gitaly/config.toml`. - For GitLab 15.2 and earlier, run `sudo /opt/gitlab/embedded/bin/gitaly-hooks check /var/opt/gitlab/gitaly/config.toml`. @@ -456,7 +456,7 @@ Configure Gitaly clients in one of two ways: this folder. This requirement is scheduled to be removed when [this issue](https://gitlab.com/gitlab-org/gitaly/-/issues/1282) is resolved. -1. Save the file and [restart GitLab](../restart_gitlab.md#installations-from-source). +1. Save the file and [restart GitLab](../restart_gitlab.md#self-compiled-installations). 1. Run `sudo -u git -H bundle exec rake gitlab:gitaly:check RAILS_ENV=production` to confirm the Gitaly client can connect to Gitaly servers. 1. Tail the logs to see the requests: @@ -570,7 +570,7 @@ Disable Gitaly on a GitLab server in one of two ways: gitaly_enabled=false ``` -1. Save the file and [restart GitLab](../restart_gitlab.md#installations-from-source). +1. Save the file and [restart GitLab](../restart_gitlab.md#self-compiled-installations). ::EndTabs @@ -705,7 +705,7 @@ Configure Gitaly with TLS in one of two ways: in this folder. This requirement is scheduled to be removed when [Gitaly issue #1282](https://gitlab.com/gitlab-org/gitaly/-/issues/1282) is resolved. -1. Save the file and [restart GitLab](../restart_gitlab.md#installations-from-source). +1. Save the file and [restart GitLab](../restart_gitlab.md#self-compiled-installations). 1. On the Gitaly servers, create or edit `/etc/default/gitlab` and add: ```shell @@ -740,14 +740,14 @@ Configure Gitaly with TLS in one of two ways: key_path = '/etc/gitlab/ssl/key.pem' ``` -1. Save the file and [restart GitLab](../restart_gitlab.md#installations-from-source). +1. Save the file and [restart GitLab](../restart_gitlab.md#self-compiled-installations). 1. Verify Gitaly traffic is being served over TLS by [observing the types of Gitaly connections](#observe-type-of-gitaly-connections). 1. Optional. Improve security by: 1. Disabling non-TLS connections by commenting out or deleting `listen_addr` in `/home/git/gitaly/config.toml`. 1. Saving the file. - 1. [Restarting GitLab](../restart_gitlab.md#installations-from-source). + 1. [Restarting GitLab](../restart_gitlab.md#self-compiled-installations). ::EndTabs @@ -1552,7 +1552,7 @@ Configure Gitaly to sign commits made with the GitLab UI in one of two ways: signing_key = "/etc/gitlab/gitaly/signing_key.gpg" ``` -1. Save the file and [restart GitLab](../restart_gitlab.md#installations-from-source). +1. Save the file and [restart GitLab](../restart_gitlab.md#self-compiled-installations). ::EndTabs diff --git a/doc/administration/gitaly/praefect.md b/doc/administration/gitaly/praefect.md index 071fa180708..6eefd0a7bb5 100644 --- a/doc/administration/gitaly/praefect.md +++ b/doc/administration/gitaly/praefect.md @@ -851,7 +851,7 @@ For self-compiled installations: data is stored in this folder. This requirement is scheduled to be removed when [this issue](https://gitlab.com/gitlab-org/gitaly/-/issues/1282) is resolved. -1. Save the file and [restart GitLab](../restart_gitlab.md#installations-from-source). +1. Save the file and [restart GitLab](../restart_gitlab.md#self-compiled-installations). 1. Copy all Praefect server certificates, or their certificate authority, to the system trusted certificates on each Gitaly server so the Praefect server trusts the certificate when called by Gitaly servers: @@ -871,7 +871,7 @@ For self-compiled installations: key_path = '/etc/gitlab/ssl/key.pem' ``` -1. Save the file and [restart GitLab](../restart_gitlab.md#installations-from-source). +1. Save the file and [restart GitLab](../restart_gitlab.md#self-compiled-installations). #### Service discovery @@ -988,7 +988,7 @@ with Praefect service discovery address, such as `praefect.service.consul`. data is stored in this folder. [Issue 375254](https://gitlab.com/gitlab-org/gitlab/-/issues/375254) proposes to remove this requirement. -1. Save the file and [restart GitLab](../restart_gitlab.md#installations-from-source). +1. Save the file and [restart GitLab](../restart_gitlab.md#self-compiled-installations). ::EndTabs |