qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/fcgiwrap: adapt consumer modules and tests

Browse Source
This commit is contained in:
euxane 2024-06-08 22:34:17 +02:00
parent 022289f2fa
commit 8101ae41f8
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/misc/zoneminder.nix
View File

@ -203,8 +203,9 @@ in {
services = {
fcgiwrap.zoneminder = lib.mkIf useNginx {
preforkProcesses = cfg.cameras;
inherit user group;
process.prefork = cfg.cameras;
process.user = user;
process.group = group;
};
mysql = lib.mkIf cfg.database.createLocally {
@ -254,7 +255,7 @@ in {
fastcgi_param HTTP_PROXY "";
fastcgi_intercept_errors on;
fastcgi_pass unix:${config.services.fcgiwrap.zoneminder.socketAddress};
fastcgi_pass unix:${config.services.fcgiwrap.zoneminder.socket.address};
}
location /cache/ {

2
nixos/modules/services/networking/cgit.nix
View File

@ -32,7 +32,7 @@ let
fastcgi_split_path_info ^(${regexLocation cfg})(/.+)$;
fastcgi_param PATH_INFO $fastcgi_path_info;
''
}fastcgi_pass unix:${config.services.fcgiwrap."cgit-${name}".socketAddress};
}fastcgi_pass unix:${config.services.fcgiwrap."cgit-${name}".socket.address};
'';
cgitrcLine = name: value: "${name}=${

6
nixos/modules/services/networking/smokeping.nix
View File

@ -338,8 +338,8 @@ in
# use nginx to serve the smokeping web service
services.fcgiwrap.smokeping = mkIf cfg.webService {
user = cfg.user;
group = cfg.user;
process.user = cfg.user;
process.group = cfg.user;
};
services.nginx = mkIf cfg.webService {
enable = true;
@ -352,7 +352,7 @@ in
locations."/smokeping.fcgi" = {
extraConfig = ''
include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_pass unix:${config.services.fcgiwrap.smokeping.socketAddress};
fastcgi_pass unix:${config.services.fcgiwrap.smokeping.socket.address};
fastcgi_param SCRIPT_FILENAME ${smokepingHome}/smokeping.fcgi;
fastcgi_param DOCUMENT_ROOT ${smokepingHome};
'';

6
nixos/tests/gitolite-fcgiwrap.nix
View File

@ -25,8 +25,8 @@ import ./make-test-python.nix (
networking.firewall.allowedTCPPorts = [ 80 ];
services.fcgiwrap.gitolite = {
user = "gitolite";
group = "gitolite";
process.user = "gitolite";
process.group = "gitolite";
};
services.gitolite = {
@ -63,7 +63,7 @@ import ./make-test-python.nix (
fastcgi_param SCRIPT_FILENAME ${pkgs.gitolite}/bin/gitolite-shell;
# use Unix domain socket or inet socket
fastcgi_pass unix:${config.services.fcgiwrap.gitolite.socketAddress};
fastcgi_pass unix:${config.services.fcgiwrap.gitolite.socket.address};
'';
};