summaryrefslogtreecommitdiff
path: root/config.yml.example
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2016-12-09 12:52:26 +0000
committerSean McGivern <sean@gitlab.com>2016-12-12 13:21:42 +0000
commitfbc213eabdbb76ec846357d980705f5d4f20ecc5 (patch)
treefbc84343e0aa947c2a30e2b1040253ba7fbd1852 /config.yml.example
parent8e370b37e16dc8eebeca264c6c351dc4a4fdab4a (diff)
downloadgitlab-shell-fbc213eabdbb76ec846357d980705f5d4f20ecc5.tar.gz
Make custom hooks dir configurable
Add a new configuration option, custom_hooks_dir. When this is set, we will look for global custom hooks in: <custom_hooks_dir>/{pre-receive,update,post-receive}.d/* When this is not set, default to <REPO_PATH>/hooks.
Diffstat (limited to 'config.yml.example')
-rw-r--r--config.yml.example6
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