From c28471ee4f59e966c0613b80e081e8456f42ca34 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 27 Aug 2024 14:51:35 +0200 Subject: git-server: follow nixpkgs fastcgi option schema update --- .dir-locals.el | 5 +++++ system/settings/services/git-server.nix | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index d9b7c0ae..d76f5371 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -15,6 +15,11 @@ (ssh-deploy-root-remote . "/sshx:linde:projects/alanpearce.eu/nixfiles/") (ssh-deploy-on-explicit-save . 1) (ssh-deploy-async . 1))))) + ("system/settings/services/git-server.nix" . + ((nil . ((ssh-deploy-root-local . "/home/alan/projects/alanpearce.eu/nixfiles/") + (ssh-deploy-root-remote . "/sshx:linde:projects/alanpearce.eu/nixfiles/") + (ssh-deploy-on-explicit-save . 1) + (ssh-deploy-async . 1))))) ("system/linde-hardware.nix" . ((nil . ((ssh-deploy-root-local . "/home/alan/projects/alanpearce.eu/nixfiles/") (ssh-deploy-root-remote . "/sshx:linde:projects/alanpearce.eu/nixfiles/") diff --git a/system/settings/services/git-server.nix b/system/settings/services/git-server.nix index 72c441f5..1560e8f5 100644 --- a/system/settings/services/git-server.nix +++ b/system/settings/services/git-server.nix @@ -64,7 +64,7 @@ let mkMirrorWants = repo: map (target: "mirror-to-${target}@${repo}.path"); in { - services.fcgiwrap.gitolite = { + services.fcgiwrap.instances.gitolite = { process = { user = "gitolite"; group = "gitolite"; @@ -117,7 +117,7 @@ in services.caddy.virtualHosts = { "git.alanpearce.eu" = let - fcgi = config.services.fcgiwrap.gitolite; + fcgi = config.services.fcgiwrap.instances.gitolite; fcgisocket = "${fcgi.socket.type}/${fcgi.socket.address}"; in { @@ -176,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 -- cgit 1.4.1