diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-10-01 13:43:58 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-10-01 15:04:49 +0300 |
| commit | 5d5da38a30cbf64ede01465b7e00fde55205a0d0 (patch) | |
| tree | 5256f000f834e1469c4123177fc70bb3bb9526ba /_support | |
| parent | 3f5e218def93024f3aafe590c22cd1b29f744105 (diff) | |
demo: Verify Gitaly install with gitaly-hooks
The terraform install uses `bin/check` from the vendorred `gitlab-shell`
code to check the hooks are configured correctly. By changing this to
`gitaly-hooks` we can prepare for a later situation where `gitlab-shell`
is removed and as such not available.
Currently the `gitaly-hooks check` command executes `gitlab-shell` under
the hood, so the results are identical.
Diffstat (limited to '_support')
| -rw-r--r-- | _support/terraform/roles/gitlab/handlers/main.yml | 4 | ||||
| -rw-r--r-- | _support/terraform/roles/gitlab/tasks/main.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/_support/terraform/roles/gitlab/handlers/main.yml b/_support/terraform/roles/gitlab/handlers/main.yml index 0c2b34ec2..08d1c835c 100644 --- a/_support/terraform/roles/gitlab/handlers/main.yml +++ b/_support/terraform/roles/gitlab/handlers/main.yml @@ -11,8 +11,8 @@ command: cmd: gitlab-rake gitlab:gitaly:check -- name: verify gitlab-shell +- name: verify gitaly-hooks configuration command: - cmd: /opt/gitlab/embedded/service/gitlab-shell/bin/check -config /opt/gitlab/embedded/service/gitlab-shell/config.yml + cmd: /opt/gitlab/embedded/bin/gitaly-hooks check /var/opt/gitlab/gitaly/config.toml delegate_to: '{{ item }}' with_items: '{{ groups.gitalies }}' diff --git a/_support/terraform/roles/gitlab/tasks/main.yml b/_support/terraform/roles/gitlab/tasks/main.yml index 6dce64975..e58539cea 100644 --- a/_support/terraform/roles/gitlab/tasks/main.yml +++ b/_support/terraform/roles/gitlab/tasks/main.yml @@ -7,7 +7,7 @@ - gitlab-ctl restart - wait gitlab - verify gitaly configuration - - verify gitlab-shell + - verify gitaly-hooks configuration - name: Set Grafana password command: |