about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorSilvan Mosberger <infinisil@icloud.com>2019-03-28 18:22:27 +0100
committerGitHub <noreply@github.com>2019-03-28 18:22:27 +0100
commitbe2f711342d81b00354458821087c3d867d1757b (patch)
treeca0ffac7136d5a7a0c63cd756de77501798fb665 /nixos
parent403aa2dfed750287b33c85b67cdfb8f8642d2bce (diff)
parentb90f5f03c2d72dd81ebfbc9d5031dbcf93aa11fd (diff)
downloadnixlib-be2f711342d81b00354458821087c3d867d1757b.tar
nixlib-be2f711342d81b00354458821087c3d867d1757b.tar.gz
nixlib-be2f711342d81b00354458821087c3d867d1757b.tar.bz2
nixlib-be2f711342d81b00354458821087c3d867d1757b.tar.lz
nixlib-be2f711342d81b00354458821087c3d867d1757b.tar.xz
nixlib-be2f711342d81b00354458821087c3d867d1757b.tar.zst
nixlib-be2f711342d81b00354458821087c3d867d1757b.zip
Merge pull request #58487 from bgamari/gitlab-gitaly-procpc
gitaly: Run gitaly with procps in scope
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/misc/gitlab.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 17c8c3ce51f4..459f6520d9ef 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -534,6 +534,7 @@ in {
       wantedBy = [ "multi-user.target" ];
       path = with pkgs; [
         openssh
+        procps  # See https://gitlab.com/gitlab-org/gitaly/issues/1562
         gitAndTools.git
         cfg.packages.gitaly.rubyEnv
         cfg.packages.gitaly.rubyEnv.wrappedRuby