From 4bc2573a15cf595867fb8b6b9f6db5a4774a4910 Mon Sep 17 00:00:00 2001 From: Jeff Slight Date: Sat, 26 Dec 2020 13:44:36 -0800 Subject: [PATCH] nixos/gitlab: move custom_hooks_dir into gitaly config (#107174) --- nixos/modules/services/misc/gitlab.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 3ee7a81dc37..35a9dccdff2 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -44,6 +44,9 @@ let [gitlab-shell] dir = "${cfg.packages.gitlab-shell}" + [hooks] + custom_hooks_dir = "${cfg.statePath}/custom_hooks" + [gitlab] secret_file = "${cfg.statePath}/gitlab_shell_secret" url = "http+unix://${pathUrlQuote gitlabSocket}" @@ -65,7 +68,6 @@ let repos_path = "${cfg.statePath}/repositories"; secret_file = "${cfg.statePath}/gitlab_shell_secret"; log_file = "${cfg.statePath}/log/gitlab-shell.log"; - custom_hooks_dir = "${cfg.statePath}/custom_hooks"; redis = { bin = "${pkgs.redis}/bin/redis-cli"; host = "127.0.0.1";