Commit b5c4b592 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg Committed by Achilleas Pipinellis

Hooks: Use gitaly-hooks instead of bin/check

`bin/check` is supplied by GitLab-Shell, and Gitaly still uses that
internally. To move away from it, GitLab will standardize on using
`gitaly-hooks` instead, opening the porting to Go possibility.

Verified at https://gitlab.com/gitlab-org/gitaly/-/merge_requests/2620
parent 6c292fba
...@@ -317,7 +317,7 @@ disable enforcement. For more information, see the documentation on configuring ...@@ -317,7 +317,7 @@ disable enforcement. For more information, see the documentation on configuring
``` ```
1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure). 1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
1. Run `sudo /opt/gitlab/embedded/service/gitlab-shell/bin/check -config /opt/gitlab/embedded/service/gitlab-shell/config.yml` 1. Run `sudo /opt/gitlab/embedded/bin/gitaly-hooks check /var/opt/gitlab/gitaly/config.toml`
to confirm that Gitaly can perform callbacks to the GitLab internal API. to confirm that Gitaly can perform callbacks to the GitLab internal API.
**For installations from source** **For installations from source**
...@@ -364,7 +364,7 @@ disable enforcement. For more information, see the documentation on configuring ...@@ -364,7 +364,7 @@ disable enforcement. For more information, see the documentation on configuring
``` ```
1. Save the files and [restart GitLab](../restart_gitlab.md#installations-from-source). 1. Save the files and [restart GitLab](../restart_gitlab.md#installations-from-source).
1. Run `sudo -u git /home/git/gitlab-shell/bin/check -config /home/git/gitlab-shell/config.yml` 1. Run `sudo -u git /home/git/gitaly/gitaly-hooks check /home/git/gitaly/config.toml`
to confirm that Gitaly can perform callbacks to the GitLab internal API. to confirm that Gitaly can perform callbacks to the GitLab internal API.
### Configure Gitaly clients ### Configure Gitaly clients
......
...@@ -873,10 +873,10 @@ Particular attention should be shown to: ...@@ -873,10 +873,10 @@ Particular attention should be shown to:
gitlab-ctl reconfigure gitlab-ctl reconfigure
``` ```
1. Verify each `gitlab-shell` on each Gitaly node can reach GitLab. On each Gitaly node run: 1. Verify on each Gitaly node the Git Hooks can reach GitLab. On each Gitaly node run:
```shell ```shell
/opt/gitlab/embedded/service/gitlab-shell/bin/check -config /opt/gitlab/embedded/service/gitlab-shell/config.yml /opt/gitlab/embedded/bin/gitaly-hooks check /var/opt/gitlab/gitaly/config.toml
``` ```
1. Verify that GitLab can reach Praefect: 1. Verify that GitLab can reach Praefect:
......
...@@ -1879,7 +1879,7 @@ On each node perform the following: ...@@ -1879,7 +1879,7 @@ On each node perform the following:
1. Optionally, from the Gitaly servers, confirm that Gitaly can perform callbacks to the internal API: 1. Optionally, from the Gitaly servers, confirm that Gitaly can perform callbacks to the internal API:
```shell ```shell
sudo /opt/gitlab/embedded/service/gitlab-shell/bin/check -config /opt/gitlab/embedded/service/gitlab-shell/config.yml sudo /opt/gitlab/embedded/bin/gitaly-hooks check /var/opt/gitlab/gitaly/config.toml
``` ```
NOTE: **Note:** NOTE: **Note:**
......
...@@ -1879,7 +1879,7 @@ On each node perform the following: ...@@ -1879,7 +1879,7 @@ On each node perform the following:
1. Optionally, from the Gitaly servers, confirm that Gitaly can perform callbacks to the internal API: 1. Optionally, from the Gitaly servers, confirm that Gitaly can perform callbacks to the internal API:
```shell ```shell
sudo /opt/gitlab/embedded/service/gitlab-shell/bin/check -config /opt/gitlab/embedded/service/gitlab-shell/config.yml sudo /opt/gitlab/embedded/bin/gitaly-hooks check /var/opt/gitlab/gitaly/config.toml
``` ```
NOTE: **Note:** NOTE: **Note:**
......
...@@ -466,7 +466,7 @@ To configure the Gitaly server: ...@@ -466,7 +466,7 @@ To configure the Gitaly server:
1. Confirm that Gitaly can perform callbacks to the internal API: 1. Confirm that Gitaly can perform callbacks to the internal API:
```shell ```shell
sudo /opt/gitlab/embedded/service/gitlab-shell/bin/check -config /opt/gitlab/embedded/service/gitlab-shell/config.yml sudo /opt/gitlab/embedded/bin/gitaly-hooks check /var/opt/gitlab/gitaly/config.toml
``` ```
### Gitaly TLS support ### Gitaly TLS support
......
...@@ -1223,7 +1223,7 @@ On each node: ...@@ -1223,7 +1223,7 @@ On each node:
1. Confirm that Gitaly can perform callbacks to the internal API: 1. Confirm that Gitaly can perform callbacks to the internal API:
```shell ```shell
sudo /opt/gitlab/embedded/service/gitlab-shell/bin/check -config /opt/gitlab/embedded/service/gitlab-shell/config.yml sudo /opt/gitlab/embedded/bin/gitaly-hooks check /var/opt/gitlab/gitaly/config.toml
``` ```
1. Verify the GitLab services are running: 1. Verify the GitLab services are running:
......
...@@ -1879,7 +1879,7 @@ On each node perform the following: ...@@ -1879,7 +1879,7 @@ On each node perform the following:
1. Optionally, from the Gitaly servers, confirm that Gitaly can perform callbacks to the internal API: 1. Optionally, from the Gitaly servers, confirm that Gitaly can perform callbacks to the internal API:
```shell ```shell
sudo /opt/gitlab/embedded/service/gitlab-shell/bin/check -config /opt/gitlab/embedded/service/gitlab-shell/config.yml sudo /opt/gitlab/embedded/bin/gitaly-hooks check /var/opt/gitlab/gitaly/config.toml
``` ```
NOTE: **Note:** NOTE: **Note:**
......
...@@ -1222,7 +1222,7 @@ On each node: ...@@ -1222,7 +1222,7 @@ On each node:
1. Confirm that Gitaly can perform callbacks to the internal API: 1. Confirm that Gitaly can perform callbacks to the internal API:
```shell ```shell
sudo /opt/gitlab/embedded/service/gitlab-shell/bin/check -config /opt/gitlab/embedded/service/gitlab-shell/config.yml sudo /opt/gitlab/embedded/bin/gitaly-hooks check /var/opt/gitlab/gitaly/config.toml
``` ```
1. Verify the GitLab services are running: 1. Verify the GitLab services are running:
......
...@@ -223,6 +223,7 @@ Example response: ...@@ -223,6 +223,7 @@ Example response:
- GitLab Geo - GitLab Geo
- GitLab Shell's `bin/check` - GitLab Shell's `bin/check`
- Gitaly
## Get new 2FA recovery codes using an SSH key ## Get new 2FA recovery codes using an SSH key
......
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