diff options
Diffstat (limited to 'krebs/3modules/git.nix')
| -rw-r--r-- | krebs/3modules/git.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix index 9f289fba7..6d666b6d6 100644 --- a/krebs/3modules/git.nix +++ b/krebs/3modules/git.nix @@ -392,13 +392,11 @@ let }; services.fcgiwrap.instances.cgit = { - enable = true; process.user = cfg.cgit.fcgiwrap.user.name; - socket.user = cfg.cgit.fcgiwrap.user.name; process.group = cfg.cgit.fcgiwrap.group.name; - socket.group = cfg.cgit.fcgiwrap.group.name; - socket.address = "/run/fcgiwrap.sock"; - # socket.type = "unix" (default) + socket.user = cfg.cgit.fcgiwrap.user.name; + socket.group = config.services.nginx.group; + socket.mode = "0660"; }; environment.etc."cgitrc".text = let @@ -462,7 +460,7 @@ let fastcgi_param PATH_INFO $uri; fastcgi_param QUERY_STRING $args; fastcgi_param HTTP_HOST $server_name; - fastcgi_pass unix:${config.services.fcgiwrap.socketAddress}; + fastcgi_pass unix:${config.services.fcgiwrap.instances.cgit.socket.address}; ''; # Smart HTTP transport. Regex based on. # https://github.com/git/git/blob/v2.27.0/http-backend.c#L708-L721 @@ -482,7 +480,7 @@ let }}; fastcgi_param PATH_INFO $fastcgi_script_name; fastcgi_param SCRIPT_FILENAME ${pkgs.git}/bin/git-http-backend; - fastcgi_pass unix:${config.services.fcgiwrap.socketAddress}; + fastcgi_pass unix:${config.services.fcgiwrap.instances.cgit.socket.address}; ''; locations."/static/".extraConfig = '' root ${pkgs.cgit}/cgit; |