public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/gitlab: move custom_hooks_dir into gitaly config (#107174)

Browse Source
This commit is contained in:
Jeff Slight 2020-12-26 13:44:36 -08:00 committed by GitHub
parent c4c899d3ef
commit 4bc2573a15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/misc/gitlab.nix
View File

@ -44,6 +44,9 @@ let
[gitlab-shell] [gitlab-shell]
dir = "${cfg.packages.gitlab-shell}" dir = "${cfg.packages.gitlab-shell}"
[hooks]
custom_hooks_dir = "${cfg.statePath}/custom_hooks"
[gitlab] [gitlab]
secret_file = "${cfg.statePath}/gitlab_shell_secret" secret_file = "${cfg.statePath}/gitlab_shell_secret"
url = "http+unix://${pathUrlQuote gitlabSocket}" url = "http+unix://${pathUrlQuote gitlabSocket}"
@ -65,7 +68,6 @@ let
repos_path = "${cfg.statePath}/repositories"; repos_path = "${cfg.statePath}/repositories";
secret_file = "${cfg.statePath}/gitlab_shell_secret"; secret_file = "${cfg.statePath}/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";