summary refs log tree commit diff stats
path: root/system/settings/services/git-server.nix
diff options
context:
space:
mode:
Diffstat (limited to 'system/settings/services/git-server.nix')
-rw-r--r--system/settings/services/git-server.nix24
1 files changed, 13 insertions, 11 deletions
diff --git a/system/settings/services/git-server.nix b/system/settings/services/git-server.nix
index 54e8560c..1560e8f5 100644
--- a/system/settings/services/git-server.nix
+++ b/system/settings/services/git-server.nix
@@ -4,7 +4,7 @@
 , ...
 }:
 let
-  inherit (lib) pipe flatten concatMapAttrs mergeAttrsList mapAttrsToList;
+  inherit (lib) pipe flatten concatMapAttrs mapAttrsToList;
   inherit (import ../../../lib/caddy.nix { inherit lib; }) security-headers;
   repos = "${config.services.gitolite.dataDir}/repositories";
 
@@ -64,13 +64,16 @@ let
   mkMirrorWants = repo: map (target: "mirror-to-${target}@${repo}.path");
 in
 {
-  services.fcgiwrap = {
-    enable = true;
-    user = "gitolite";
-    group = "gitolite";
-    preforkProcesses = 2;
-    socketType = "tcp6";
-    socketAddress = "[::1]:9000";
+  services.fcgiwrap.instances.gitolite = {
+    process = {
+      user = "gitolite";
+      group = "gitolite";
+      prefork = 2;
+    };
+    socket = {
+      type = "tcp6";
+      address = "[::1]:9000";
+    };
   };
   services.gitolite = {
     enable = true;
@@ -114,8 +117,8 @@ in
   services.caddy.virtualHosts = {
     "git.alanpearce.eu" =
       let
-        fcgi = config.services.fcgiwrap;
-        fcgisocket = "${fcgi.socketType}/${fcgi.socketAddress}";
+        fcgi = config.services.fcgiwrap.instances.gitolite;
+        fcgisocket = "${fcgi.socket.type}/${fcgi.socket.address}";
       in
       {
         useACMEHost = "alanpearce.eu";
@@ -173,7 +176,6 @@ in
                   enable-log-linecount=1
                   max-stats=year
                   snapshots=tar.lz tar.zst zip
-                  cache-size=10240
                   enable-http-clone=1
                   enable-commit-graph=1
                   mimetype-file=${pkgs.nginx}/conf/mime.types