3 files changed, 41 insertions, 3 deletions
diff --git a/modules/vhack/gi/git-back/module.nix b/modules/vhack/gi/git-back/module.nix
new file mode 100644
index 0000000..90be345
--- /dev/null
+++ b/modules/vhack/gi/git-back/module.nix
@@ -0,0 +1,33 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.vhack.git-back;
+in {
+  options.vhack.git-back = {
+    enable = lib.mkEnableOption "Back integration into git-server";
+
+    domain = lib.mkOption {
+      type = lib.types.str;
+      description = "The domain where to deploy back";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    # vhack.back = {
+    #   enable = true;
+    #
+    #   user = "git";
+    #   group = "git";
+    #
+    #   settings = {
+    #     scan_path = "${config.services.gitolite.dataDir}/repositories";
+    #     project_list = "${config.services.gitolite.dataDir}/projects.list";
+    #     root_url = "https://${cfg.domain}";
+    #   };
+    # };
+    #
+    # vhack.anubis.instances."${cfg.domain}".target = "http://127.0.0.1:8000";
+  };
+}
diff --git a/modules/by-name/gi/git-server/css.nix b/modules/vhack/gi/git-server/css.nix
index 7d0ad06..7d0ad06 100644
--- a/modules/by-name/gi/git-server/css.nix
+++ b/modules/vhack/gi/git-server/css.nix
diff --git a/modules/by-name/gi/git-server/module.nix b/modules/vhack/gi/git-server/module.nix
index db35897..3e2c848 100644
--- a/modules/by-name/gi/git-server/module.nix
+++ b/modules/vhack/gi/git-server/module.nix
@@ -8,8 +8,7 @@
 
   cgitCss = import ./css.nix {
     inherit pkgs;
-    cgitPkg =
-      config.services.cgit."${cfg.domain}".package;
+    cgitPkg = config.services.cgit."${cfg.domain}".package;
   };
 in {
   options.vhack.git-server = {
@@ -84,10 +83,16 @@ in {
 
       cgit."${cfg.domain}" = {
         enable = true;
-        package = pkgs.cgit-pink;
+        package = pkgs.cgit;
         scanPath = "${config.services.gitolite.dataDir}/repositories";
         user = "git";
         group = "git";
+
+        # Don't bypass `cgit` when performing a http only clone.
+        # This is slightly slower, but we don't need to worry about the access
+        # restrictions also being by-passed.
+        gitHttpBackend.enable = false;
+
         settings = {
           branch-sort = "age";