From f8747d528c4dc8d973e8d199178b85698c00f3be Mon Sep 17 00:00:00 2001
From: Ray Andrew <4437323+rayandrew@users.noreply.github.com>
Date: Sat, 12 Oct 2024 04:01:27 +0000
Subject: [PATCH] update

---
 hosts/git/configuration.nix | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/hosts/git/configuration.nix b/hosts/git/configuration.nix
index 5837af4..b07d77d 100644
--- a/hosts/git/configuration.nix
+++ b/hosts/git/configuration.nix
@@ -47,19 +47,20 @@
       ];
       extraGroups = ["wheel"];
     };
-    cgit = {
-      createHome = true;
-      isSystemUser = true;
-      shell = "${pkgs.git}/bin/git-shell";
+    git = {
+      # createHome = true;
+      # isSystemUser = lib.mkForce false;
+      isNormalUser = true;
+      # shell = "${pkgs.git}/bin/git-shell";
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE7uSjbOgWMdaEzRGlEKM7kvT7q6jnAEZPQELAH6WAEM"
       ];
-      group = "cgit";
+      group = "git";
     };
   };
 
   users.groups = {
-    cgit = {};
+    git = {};
   };
 
   services.openssh = {
@@ -129,14 +130,23 @@
     # clones = {
     #   cgit = { owner = "thedroneely"; url = "https://git.zx2c4.com/cgit"; };
     # };
-    scanPath = "/srv/cgit/repos";
+    scanPath = "${config.services.gitolite.dataDir}/repositories";
     extraConfig = ''
       robots=noindex
     '';
+    # user = "git";
+    # group = "git";
+  };
+
+  services.gitolite = {
+    enable = true;
+    adminPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE7uSjbOgWMdaEzRGlEKM7kvT7q6jnAEZPQELAH6WAEM";
+    # user = "git";
+    # group = "git";    
   };
 
   services.nginx.virtualHosts."git.rs.ht" = {
-    addSSL = true;
+    forceSSL = true;
     enableACME = true;
   };