modules/cgit: run CGI through lighttpd

Running each cgit request in its own unit means that they can be timed
out, which isn't supported by cgiserver.

1 files changed, 29 insertions, 13 deletions

diff --git a/modules/server/cgit/default.nix b/modules/server/cgit/default.nix
index b7c3c56389db..aba0d1b54c5d 100644
--- a/modules/server/cgit/default.nix
+++ b/modules/server/cgit/default.nix
@@ -23,7 +23,7 @@ let
           tryFiles = "$uri @${name}-cgit";
         };
         "@${name}-cgit" = {
-          proxyPass = "http://unix:/run/cgiserver/cgit/${name}.sock";
+          proxyPass = "http://unix:/run/cgit/${name}.sock";
         };
       } // optionalAttrs (unslashedPath != "") {
         ${unslashedPath} = {
@@ -72,13 +72,6 @@ in
             description = mdDoc "cgit package to use";
           };
 
-          cgiserver = mkOption {
-            type = types.package;
-            default = pkgs.cgiserver;
-            defaultText = literalExpression "pkgs.cgiserver";
-            description = mdDoc "cgiserver package to use";
-          };
-
           config = mkOption {
             type = types.package;
             description = mdDoc ''
@@ -98,19 +91,42 @@ in
     services.nginx.virtualHosts = vhostConfigs;
 
     systemd.services = flip mapAttrs' cfg.instances (name: instance: {
-      name = "cgit-${name}";
+      name = "lighttpd-${name}@";
       value = {
-        environment.CGIT_CONFIG = instance.config;
+        unitConfig.CollectMode = "inactive-or-failed";
+        serviceConfig.StandardInput = "socket";
+        serviceConfig.StandardOutput = "socket";
+        serviceConfig.StandardError = "journal";
         serviceConfig.DynamicUser = true;
-        serviceConfig.ExecStart = "${instance.cgiserver}/bin/cgiserver -r ${instance.path}/ ${instance.package}/cgit/cgit.cgi";
+        serviceConfig.Type = "oneshot";
+        serviceConfig.TimeoutSec = "30";
+        serviceConfig.ExecStart = "${lib.getExe pkgs.lighttpd} -1 -f ${pkgs.writeText "lighttpd-${name}.conf" ''
+          server.modules = ( "mod_alias", "mod_setenv", "mod_cgi" )
+
+          server.document-root = "/var/empty"
+
+          alias.url = (
+            "${if instance.path == "/" then "" else instance.path}" =>
+              "${instance.package}/cgit/cgit.cgi"
+          )
+
+          cgi.assign = (
+            "cgit.cgi" => "${instance.package}/cgit/cgit.cgi"
+          )
+
+          setenv.add-environment = (
+            "CGIT_CONFIG" => "${instance.config}"
+          )
+        ''}";
       };
     });
 
     systemd.sockets = flip mapAttrs' cfg.instances (name: instance: {
-      name = "cgit-${name}";
+      name = "lighttpd-${name}";
       value = {
         wantedBy = [ "sockets.target" ];
-        socketConfig.ListenStream = "/run/cgiserver/cgit/${name}.sock";
+        socketConfig.ListenStream = "/run/cgit/${name}.sock";
+        socketConfig.Accept = "yes";
       };
     });
   };