tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
gitlab module: gitaly fixes
Robin Gloster
8 years ago
69c396f2
546fa2e1
+5
-1
1 changed file
expand all
collapse all
unified
split
nixos
modules
services
misc
gitlab.nix
+5
-1
nixos/modules/services/misc/gitlab.nix
···
29
30
gitalyToml = pkgs.writeText "gitaly.toml" ''
31
socket_path = "${lib.escape ["\""] gitalySocket}"
0
32
prometheus_listen_addr = "localhost:9236"
0
0
0
33
34
[gitaly-ruby]
35
dir = "${cfg.packages.gitaly.ruby}"
···
489
after = [ "network.target" "gitlab.service" ];
490
wantedBy = [ "multi-user.target" ];
491
environment.HOME = gitlabEnv.HOME;
492
-
path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ];
493
serviceConfig = {
494
#PermissionsStartOnly = true; # preStart must be run as root
495
Type = "simple";
···
29
30
gitalyToml = pkgs.writeText "gitaly.toml" ''
31
socket_path = "${lib.escape ["\""] gitalySocket}"
32
+
bin_dir = "${cfg.packages.gitaly}/bin"
33
prometheus_listen_addr = "localhost:9236"
34
+
35
+
[git]
36
+
bin_path = "${pkgs.git}/bin/git"
37
38
[gitaly-ruby]
39
dir = "${cfg.packages.gitaly.ruby}"
···
493
after = [ "network.target" "gitlab.service" ];
494
wantedBy = [ "multi-user.target" ];
495
environment.HOME = gitlabEnv.HOME;
496
+
path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ruby ];
497
serviceConfig = {
498
#PermissionsStartOnly = true; # preStart must be run as root
499
Type = "simple";