From dca8b41a103eb69763311eb445eab0819df9f7c0 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Sat, 28 Jan 2017 20:58:13 +0530 Subject: [PATCH] sync gitlab-shell config.yml with upstream --- assets/runtime/config/gitlab-shell/config.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/assets/runtime/config/gitlab-shell/config.yml b/assets/runtime/config/gitlab-shell/config.yml index 2649a13a..ac29e04b 100644 --- a/assets/runtime/config/gitlab-shell/config.yml +++ b/assets/runtime/config/gitlab-shell/config.yml @@ -28,9 +28,13 @@ http_settings: auth_file: "{{GITLAB_HOME}}/.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: "{{GITLAB_SHELL_INSTALL_DIR}}/.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: "{{GITLAB_SHELL_INSTALL_DIR}}//hooks" + # Redis settings used for pushing commit notices to gitlab redis: bin: /usr/bin/redis-cli