Merge pull request #48292 from jslight90/gitlab

nixos/gitlab: add custom hooks directory for gitlab-shell
This commit is contained in:
Jörg Thalheim 2018-10-13 10:55:42 +01:00 committed by GitHub
commit b899df4f3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -53,6 +53,7 @@ let
repos_path: "${cfg.statePath}/repositories" repos_path: "${cfg.statePath}/repositories"
secret_file: "${cfg.statePath}/config/gitlab_shell_secret" secret_file: "${cfg.statePath}/config/gitlab_shell_secret"
log_file: "${cfg.statePath}/log/gitlab-shell.log" log_file: "${cfg.statePath}/log/gitlab-shell.log"
custom_hooks_dir: "${cfg.statePath}/custom_hooks"
redis: redis:
bin: ${pkgs.redis}/bin/redis-cli bin: ${pkgs.redis}/bin/redis-cli
host: 127.0.0.1 host: 127.0.0.1
@ -562,6 +563,9 @@ in {
mkdir -p ${cfg.statePath}/shell mkdir -p ${cfg.statePath}/shell
mkdir -p ${cfg.statePath}/db mkdir -p ${cfg.statePath}/db
mkdir -p ${cfg.statePath}/uploads mkdir -p ${cfg.statePath}/uploads
mkdir -p ${cfg.statePath}/custom_hooks/pre-receive.d
mkdir -p ${cfg.statePath}/custom_hooks/post-receive.d
mkdir -p ${cfg.statePath}/custom_hooks/update.d
rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
mkdir -p ${cfg.statePath}/config mkdir -p ${cfg.statePath}/config