Merge pull request #1884 from taomaree/custom_hooks_dir

Add support for GITLAB_SHELL_CUSTOM_HOOKS_DIR

Author: sameersbn

README.md

@@ -812,6 +812,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_PROJECTS_SNIPPETS` | Set if *snippets* feature should be enabled by default for new projects. Defaults to `false`. |
 | `GITLAB_PROJECTS_BUILDS` | Set if *builds* feature should be enabled by default for new projects. Defaults to `true`. |
 | `GITLAB_PROJECTS_CONTAINER_REGISTRY` | Set if *container_registry* feature should be enabled by default for new projects. Defaults to `true`. |
+| `GITLAB_SHELL_CUSTOM_HOOKS_DIR` | Global custom hooks directory. Defaults to `/home/git/gitlab-shell/hooks`. |
 | `GITLAB_WEBHOOK_TIMEOUT` | Sets the timeout for webhooks. Defaults to `10` seconds. |
 | `GITLAB_NOTIFY_ON_BROKEN_BUILDS` | Enable or disable broken build notification emails. Defaults to `true` |
 | `GITLAB_NOTIFY_PUSHER` | Add pusher to recipients list of broken build notification emails. Defaults to `false` |

assets/runtime/env-defaults

@@ -505,6 +505,9 @@ GITALY_TOKEN=${GITALY_TOKEN:-}
 GITALY_SOCKET_PATH=${GITLAB_INSTALL_DIR}/tmp/sockets/private/gitaly.socket
 GITALY_ADDRESS=${GITALY_ADDRESS:-unix:$GITALY_SOCKET_PATH}
 
+## GitLab Shell
+GITLAB_SHELL_CUSTOM_HOOKS_DIR=${GITLAB_SHELL_CUSTOM_HOOKS_DIR:-"$GITLAB_SHELL_INSTALL_DIR/hooks"}
+
 ## MONITORING
 GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL=${GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL:-10}
 GITLAB_MONITORING_IP_WHITELIST=${GITLAB_MONITORING_IP_WHITELIST:-"0.0.0.0/8"}

assets/runtime/functions

@@ -1721,6 +1721,13 @@ configure_gitlab_shell() {
     REDIS_HOST \
     REDIS_PORT \
     REDIS_DB_NUMBER
+
+  # update custom_hooks_dir if set $GITLAB_SHELL_CUSTOM_HOOKS_DIR
+  if [[ -n ${GITLAB_SHELL_CUSTOM_HOOKS_DIR} ]]; then
+    exec_as_git sed -i \
+      "s|custom_hooks_dir:.*|custom_hooks_dir: $GITLAB_SHELL_CUSTOM_HOOKS_DIR|g" \
+      ${GITLAB_SHELL_CONFIG}
+  fi
 }