From c5dc3e203410bc3bfc77182cd8c6955b1bd64cfd Mon Sep 17 00:00:00 2001 From: euxane Date: Sat, 8 Jun 2024 23:07:33 +0200 Subject: [PATCH] nixos/fcgiwrap: adapt consumer modules and tests --- nixos/modules/services/networking/cgit.nix | 1 + nixos/modules/services/networking/smokeping.nix | 1 + nixos/tests/gitolite-fcgiwrap.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/nixos/modules/services/networking/cgit.nix b/nixos/modules/services/networking/cgit.nix index 3bfd7fbe44e4..640c989aaf4c 100644 --- a/nixos/modules/services/networking/cgit.nix +++ b/nixos/modules/services/networking/cgit.nix @@ -167,6 +167,7 @@ in services.fcgiwrap = flip mapAttrs' cfgs (name: cfg: nameValuePair "cgit-${name}" { + socket = { inherit (config.services.nginx) user group; }; } ); diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index af50ad27e27e..a07cde847cf6 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -340,6 +340,7 @@ in services.fcgiwrap.smokeping = mkIf cfg.webService { process.user = cfg.user; process.group = cfg.user; + socket = { inherit (config.services.nginx) user group; }; }; services.nginx = mkIf cfg.webService { enable = true; diff --git a/nixos/tests/gitolite-fcgiwrap.nix b/nixos/tests/gitolite-fcgiwrap.nix index a4ecf2fc54c4..6e8dae6f72d7 100644 --- a/nixos/tests/gitolite-fcgiwrap.nix +++ b/nixos/tests/gitolite-fcgiwrap.nix @@ -27,6 +27,7 @@ import ./make-test-python.nix ( services.fcgiwrap.gitolite = { process.user = "gitolite"; process.group = "gitolite"; + socket = { inherit (config.services.nginx) user group; }; }; services.gitolite = {