diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2020-10-14 19:25:15 +0300 |
|---|---|---|
| committer | Christian Couder <chriscool@tuxfamily.org> | 2020-10-14 19:25:15 +0300 |
| commit | 378eec6c945df73b2a1e2d7002beeeb84b5c060d (patch) | |
| tree | 6e43f8147ada29b9ed220de5d93bcc3b72bf4bb6 | |
| parent | 4e9663a71ccb3096a69dcfe17957fecdf5558c44 (diff) | |
| parent | 5d5da38a30cbf64ede01465b7e00fde55205a0d0 (diff) | |
Merge branch 'zj-gitaly-hooks-over-shell-check' into 'master'
demo: Verify Gitaly install with gitaly-hooks
See merge request gitlab-org/gitaly!2620
| -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: |