summary refs log tree commit diff
path: root/nixos/modules/services/misc/gitlab.nix
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-03-28 10:46:22 -0400
committerBen Gamari <ben@smart-cactus.org>2019-03-28 10:48:51 -0400
commitb90f5f03c2d72dd81ebfbc9d5031dbcf93aa11fd (patch)
tree13d83e250075e9003114512236d68fe0b322ddb9 /nixos/modules/services/misc/gitlab.nix
parentd984875aff3db0da17b36b1b75dd0c3277732060 (diff)
downloadnixpkgs-b90f5f03c2d72dd81ebfbc9d5031dbcf93aa11fd.tar
nixpkgs-b90f5f03c2d72dd81ebfbc9d5031dbcf93aa11fd.tar.gz
nixpkgs-b90f5f03c2d72dd81ebfbc9d5031dbcf93aa11fd.tar.bz2
nixpkgs-b90f5f03c2d72dd81ebfbc9d5031dbcf93aa11fd.tar.lz
nixpkgs-b90f5f03c2d72dd81ebfbc9d5031dbcf93aa11fd.tar.xz
nixpkgs-b90f5f03c2d72dd81ebfbc9d5031dbcf93aa11fd.tar.zst
nixpkgs-b90f5f03c2d72dd81ebfbc9d5031dbcf93aa11fd.zip
nixos/gitaly: Run gitaly with procps in scope
Gitaly uses `ps` to track the RSS of `gitlab-ruby` and kills it when it
detects excessive memory leakage. See
https://gitlab.com/gitlab-org/gitaly/issues/1562.
Diffstat (limited to 'nixos/modules/services/misc/gitlab.nix')
-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 17c8c3ce51f..459f6520d9e 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