From 756539a59687f9abc9fef5fce50b5590c35a242f Mon Sep 17 00:00:00 2001
From: Aspen Smith <root@gws.fyi>
Date: Sun, 28 Jul 2024 12:58:22 -0400
Subject: chore(3p/sources): Bump channels & overlays (2024-07-28)

* Treewide: re-run depotfmt

* //third_party/nixpkgs:html5validator: build with Python 3.11,
  dependency openstackdocstheme doesn't support 3.12

* //users/sterni/machines/ingeborg: adapt to poorly handled fcgiwrap
  module API change: https://github.com/NixOS/nixpkgs/pull/318599

* //tvix/*-go: regenerate protobuf files

* //third_party/nixpkgs:treefmt: Remove patch for merged pull request

* //users/flokli/ipu6-softisp: rebase, drop upstreamed kernel patches

Change-Id: Ie4e0df007c287e8cd6207683a9a25838aa5bd39a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11971
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: flokli <flokli@flokli.de>
Reviewed-by: aspen <root@gws.fyi>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: Ilan Joselevich <personal@ilanjoselevich.com>
---
 users/sterni/machines/ingeborg/http/code.sterni.lv.nix | 16 ++++++++++++++--
 users/sterni/machines/ingeborg/http/fcgiwrap.nix       | 15 ---------------
 2 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 users/sterni/machines/ingeborg/http/fcgiwrap.nix

(limited to 'users/sterni/machines/ingeborg')

diff --git a/users/sterni/machines/ingeborg/http/code.sterni.lv.nix b/users/sterni/machines/ingeborg/http/code.sterni.lv.nix
index fd4975ed1d59..3b080b9dc8b5 100644
--- a/users/sterni/machines/ingeborg/http/code.sterni.lv.nix
+++ b/users/sterni/machines/ingeborg/http/code.sterni.lv.nix
@@ -167,10 +167,22 @@ in
 {
   imports = [
     ./nginx.nix
-    ./fcgiwrap.nix
   ];
 
   config = {
+    services.fcgiwrap.cgit = {
+      process = {
+        user = "http";
+        group = "http";
+      };
+      # Default value doesn't work as documented
+      # https://github.com/NixOS/nixpkgs/pull/318599/files#r1673885083
+      socket = {
+        user = "http";
+        group = "http";
+      };
+    };
+
     services.nginx.virtualHosts."${virtualHost}" = {
       enableACME = true;
       forceSSL = true;
@@ -185,7 +197,7 @@ in
           fastcgi_param    QUERY_STRING    $args;
           fastcgi_param    HTTP_HOST       $server_name;
           fastcgi_param    CGIT_CONFIG     ${cgitConfig};
-          fastcgi_pass     unix:${toString config.services.fcgiwrap.socketAddress};
+          fastcgi_pass     unix:${toString config.services.fcgiwrap.cgit.socket.address};
         }
       '';
     };
diff --git a/users/sterni/machines/ingeborg/http/fcgiwrap.nix b/users/sterni/machines/ingeborg/http/fcgiwrap.nix
deleted file mode 100644
index 19696d85d413..000000000000
--- a/users/sterni/machines/ingeborg/http/fcgiwrap.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./nginx.nix
-  ];
-
-  config.services.fcgiwrap = {
-    enable = true;
-    socketType = "unix";
-    socketAddress = "/run/fcgiwrap.sock";
-    user = "http";
-    group = "http";
-  };
-}
-- 
cgit 1.4.1