Skip to content

Commit 3e5fa9f

Browse files
committed
Sync config v14.9.0 : Move custom_hooks_dir from gitlab-shell to gitaly
This is done in gitlab 14.9 release. See corresponding merge requests: gitlab-shell side https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/378 gitaly side: First introduced in MR 2066 for [gitlab-shell] scope https://gitlab.com/gitlab-org/gitaly/-/merge_requests/2066 Then moved to [hook] scope in MR 2187, https://gitlab.com/gitlab-org/gitaly/-/merge_requests/2187 but reverted and moved back to [gitlab-shell] scope. https://gitlab.com/gitlab-org/gitaly/-/merge_requests/2196 If the value is empty or not set, it fallback to {gitlab-shell install directory} See https://gitlab.com/gitlab-org/gitaly/-/blob/16b38f034eb38253006a2e69a4b4220717b45a99/internal/gitaly/config/config.go#L231-233 Also note that there was a issue for 13-0 stable about default value (already fixed in later release) https://gitlab.com/gitlab-org/gitaly/-/merge_requests/2275 First contained tag: v13.0.0 (gitlab-shell, gitaly, gitlab)
1 parent 77558c1 commit 3e5fa9f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

assets/runtime/config/gitaly/config.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ dir = "{{GITLAB_GITALY_INSTALL_DIR}}/ruby"
9191
# The directory where gitlab-shell is installed
9292
dir = "{{GITLAB_SHELL_INSTALL_DIR}}"
9393

94+
[hooks]
95+
custom_hooks_dir = "{{GITLAB_SHELL_INSTALL_DIR}}/hooks"
96+
97+
9498
# # You can adjust the concurrency of each RPC endpoint
9599
# [[concurrency]]
96100
# rpc = "/gitaly.RepositoryService/GarbageCollect"

assets/runtime/config/gitlab-shell/config.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ secret_file: "{{GITLAB_SHELL_INSTALL_DIR}}/.gitlab_shell_secret"
4343
# file will not be read.
4444
# secret: "supersecret"
4545

46-
# Parent directory for global custom hook directories (pre-receive.d, update.d, post-receive.d)
47-
# Default is hooks in the gitlab-shell directory.
48-
custom_hooks_dir: "{{GITLAB_SHELL_INSTALL_DIR}}/hooks"
49-
5046
# Log file.
5147
# Default is gitlab-shell.log in the root directory.
5248
log_file: "{{GITLAB_LOG_DIR}}/gitlab-shell/gitlab-shell.log"

0 commit comments

Comments
 (0)