diff options
| author | tv <tv@krebsco.de> | 2024-09-26 12:50:00 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2024-09-26 13:00:26 +0200 |
| commit | 10a198ffaba436bf4711a206b4e888d5c817f821 (patch) | |
| tree | 51ffac14184fd58ec375eae5ace7a7d10e52bce1 /krebs/3modules | |
| parent | 3f4467a8d12f091b3b6a72e609f663ba7318069d (diff) | |
cgit: use services.fcgiwrap.instances
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/git.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix index 961b217e1..6d666b6d6 100644 --- a/krebs/3modules/git.nix +++ b/krebs/3modules/git.nix @@ -391,12 +391,12 @@ let }; }; - services.fcgiwrap = { - enable = true; - user = cfg.cgit.fcgiwrap.user.name; - group = cfg.cgit.fcgiwrap.group.name; - # socketAddress = "/run/fcgiwrap.sock" (default) - # socketType = "unix" (default) + services.fcgiwrap.instances.cgit = { + process.user = cfg.cgit.fcgiwrap.user.name; + process.group = cfg.cgit.fcgiwrap.group.name; + socket.user = cfg.cgit.fcgiwrap.user.name; + socket.group = config.services.nginx.group; + socket.mode = "0660"; }; environment.etc."cgitrc".text = let @@ -460,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 @@ -480,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; |