Re-add cgit

4 files changed, 21 insertions, 20 deletions

diff --git a/flake.nix b/flake.nix

index bb122bc..c2b85ff 100755
--- a/flake.nix
+++ b/flake.nix
@@ -97,6 +97,9 @@
           modules = [
             ./host/Rory-ovh/configuration.nix
             ./hardware-configuration.nix
+
+            ./host/Rory-nginx/services/matrix/synapse/workers/module.nix
+
             home-manager.nixosModules.home-manager
             lix-module.nixosModules.default
             grapevine.nixosModules.default
@@ -167,23 +170,22 @@
                 ];
                 nixpkgs.overlays = [
                   (final: prev: {
-                    matrix-synapse-unwrapped = inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.matrix-synapse-unwrapped
-                      .overrideAttrs (old: {
-                        patches = [ ./private/synapse-fast-links.patch ];
-                        #doCheck = false;
-                        #checkPhase = "";
-                      });
+                    matrix-synapse-unwrapped = inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.matrix-synapse-unwrapped.overrideAttrs (old: {
+                      patches = [ ./private/synapse-fast-links.patch ];
+                      #doCheck = false;
+                      #checkPhase = "";
+                    });
                     draupnir = inputs.nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
-#                      .overrideAttrs (old: {
-#                        src = draupnirSrc;
-#                        packageJSON = draupnirSrc + "/package.json";
-#                        offlineCache = pkgs.fetchYarnDeps {
-#                          pname = "${old.pname}-yarn-offline-cache";
-#                          yarnLock = draupnirSrc + "/yarn.lock";
-#                          hash = "sha256-vXCSN7kdbtqzIbVu6S0SoI7GXoZPIV4Ag399dbLaY1g=";
-#                          
-##                        };
-#                      });
+                    #                      .overrideAttrs (old: {
+                    #                        src = draupnirSrc;
+                    #                        packageJSON = draupnirSrc + "/package.json";
+                    #                        offlineCache = pkgs.fetchYarnDeps {
+                    #                          pname = "${old.pname}-yarn-offline-cache";
+                    #                          yarnLock = draupnirSrc + "/yarn.lock";
+                    #                          hash = "sha256-vXCSN7kdbtqzIbVu6S0SoI7GXoZPIV4Ag399dbLaY1g=";
+                    #
+                    ##                        };
+                    #                      });
                     keydb = inputs.nixpkgs-keydb.legacyPackages.${pkgs.stdenv.hostPlatform.system}.keydb;
                   })
                 ];
diff --git a/host/Rory-ovh/configuration.nix b/host/Rory-ovh/configuration.nix

index cc2ea4e..72bc2ec 100755
--- a/host/Rory-ovh/configuration.nix
+++ b/host/Rory-ovh/configuration.nix
@@ -20,6 +20,7 @@
     ./services/prometheus.nix
 
     ./services/nginx/nginx.nix
+    ./services/cgit.nix
     ./services/postgres.nix
   ];
 
diff --git a/host/Rory-ovh/services/cgit.nix b/host/Rory-ovh/services/cgit.nix

index fb762d1..9c18aca 100644
--- a/host/Rory-ovh/services/cgit.nix
+++ b/host/Rory-ovh/services/cgit.nix
@@ -5,7 +5,7 @@ let
     enable = true;
     nginx.virtualHost = "cgit.rory.gay";
     package = pkgs.cgit-pink;
-    scanPath = "/data/nginx/html_git";
+    scanPath = "/data/git";
     settings = {
       css = "/cgit.css";
       logo = "/cgit.png";
@@ -46,7 +46,7 @@ in
   services.cgit."main" = base_cgit_config;
 
   services.cgit."ocp" = lib.attrsets.recursiveUpdate base_cgit_config {
-    scanPath = "/data/nginx/html_git/.ocp";
+    scanPath = "/data/git/.ocp";
     nginx.location = "/.ocp/";
     settings.clone-url = (
       lib.concatStringsSep " " [
diff --git a/host/Rory-ovh/services/matrix/synapse/synapse-main.nix b/host/Rory-ovh/services/matrix/synapse/synapse-main.nix

index 02456df..0b75412 100755
--- a/host/Rory-ovh/services/matrix/synapse/synapse-main.nix
+++ b/host/Rory-ovh/services/matrix/synapse/synapse-main.nix
@@ -3,8 +3,6 @@
 {
   # Worker plumbing examples: https://github.com/element-hq/synapse/blob/master/docker/configure_workers_and_start.py
   # Documentation: https://github.com/element-hq/synapse/blob/develop/docs/workers.md
-  imports = [ ./workers/module.nix ];
-
   services.matrix-synapse = {
     enable = true;
     withJemalloc = true;