diff options
| author | Robin Gloster <mail@glob.in> | 2018-01-07 02:04:49 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-01-07 05:02:35 +0100 |
| commit | 69c396f273726e2e82f03dedf18b40eb1ebbc055 (patch) | |
| tree | eb950b0c8182b02f11f097911e7d3ded3f5889af /nixos/modules/services/misc/gitlab.nix | |
| parent | 546fa2e118a927b07cc32844a5ceec56f7524cf3 (diff) | |
| download | nixlib-69c396f273726e2e82f03dedf18b40eb1ebbc055.tar nixlib-69c396f273726e2e82f03dedf18b40eb1ebbc055.tar.gz nixlib-69c396f273726e2e82f03dedf18b40eb1ebbc055.tar.bz2 nixlib-69c396f273726e2e82f03dedf18b40eb1ebbc055.tar.lz nixlib-69c396f273726e2e82f03dedf18b40eb1ebbc055.tar.xz nixlib-69c396f273726e2e82f03dedf18b40eb1ebbc055.tar.zst nixlib-69c396f273726e2e82f03dedf18b40eb1ebbc055.zip | |
gitlab module: gitaly fixes
Diffstat (limited to 'nixos/modules/services/misc/gitlab.nix')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index b514d914eefb..07edad0b2ef6 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -29,8 +29,12 @@ let gitalyToml = pkgs.writeText "gitaly.toml" '' socket_path = "${lib.escape ["\""] gitalySocket}" + bin_dir = "${cfg.packages.gitaly}/bin" prometheus_listen_addr = "localhost:9236" + [git] + bin_path = "${pkgs.git}/bin/git" + [gitaly-ruby] dir = "${cfg.packages.gitaly.ruby}" @@ -489,7 +493,7 @@ in { after = [ "network.target" "gitlab.service" ]; wantedBy = [ "multi-user.target" ]; environment.HOME = gitlabEnv.HOME; - path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ]; + path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ruby ]; serviceConfig = { #PermissionsStartOnly = true; # preStart must be run as root Type = "simple"; |