diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-12-12 15:09:20 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-12-12 15:09:20 +0000 |
| commit | 92dad7c1855666cb0755ee1f9f6f1910c903fb92 (patch) | |
| tree | 39ee847a871636e0f71e25ecaf6c50799de31df0 /config.yml.example | |
| parent | 8e370b37e16dc8eebeca264c6c351dc4a4fdab4a (diff) | |
| parent | bf21f6eeef482c71a5ff2b3d26da048ac236b075 (diff) | |
| download | gitlab-shell-4.1.0.tar.gz | |
Merge branch 'make-custom-hook-dir-configurable' into 'master'
v4.1.0
Make custom hook dir configurable
Add a new configuration option, custom_hook_dir. When this is set, we
will look for global custom hooks in: `<custom_hook_dir>/{pre-receive,update,post-receive}.d/*`
When this is not set, default to `<ROOT_PATH>/hooks`.
Relates to https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1754 and
gitlab-org/gitlab-ce!8040.
See merge request !113
Diffstat (limited to 'config.yml.example')
| -rw-r--r-- | config.yml.example | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config.yml.example b/config.yml.example index 0164830..cf6c91b 100644 --- a/config.yml.example +++ b/config.yml.example @@ -28,9 +28,13 @@ http_settings: auth_file: "/home/git/.ssh/authorized_keys" # File that contains the secret key for verifying access to GitLab. -# Default is .gitlab_shell_secret in the root directory. +# Default is .gitlab_shell_secret in the gitlab-shell directory. # secret_file: "/home/git/gitlab-shell/.gitlab_shell_secret" +# Parent directory for global custom hook directories (pre-receive.d, update.d, post-receive.d) +# Default is hooks in the gitlab-shell directory. +# custom_hooks_dir: "/home/git/gitlab-shell/hooks" + # Redis settings used for pushing commit notices to gitlab redis: bin: /usr/bin/redis-cli |