sagittarius: re-enable git...

1 files changed, 28 insertions, 24 deletions

diff --git a/hosts/sagittarius/web/git.nix b/hosts/sagittarius/web/git.nix
index 205d661..8e7b772 100644
--- a/hosts/sagittarius/web/git.nix
+++ b/hosts/sagittarius/web/git.nix
@@ -1,6 +1,6 @@
 { config, ... }:
 let
-  secrets = config.sops.secrets;
+  # secrets = config.sops.secrets;
   domainInternal = "git.sorre.internal";
   domainPublic = "git.sorre.xyz";
 
@@ -9,20 +9,22 @@ let
   };
 in
 {
+  imports = [ ./acme.nix ];
+
   services.nginx = {
-    enable = false;
-    virtualHosts."${domainInternal}" = {
-      forceSSL = true;
-      sslCertificateKey = secrets."wg-ca-key".path;
-      sslCertificate = secrets."wg-ca-crt".path;
-      listen = [
-        {
-          addr = "100.64.0.3";
-          port = 443;
-          ssl = true;
-        }
-      ];
-    };
+    enable = true;
+    # virtualHosts."${domainInternal}" = {
+    #   forceSSL = true;
+    #   sslCertificateKey = secrets."wg-ca-key".path;
+    #   sslCertificate = secrets."wg-ca-crt".path;
+    #   listen = [
+    #     {
+    #       addr = "100.64.0.3";
+    #       port = 443;
+    #       ssl = true;
+    #     }
+    #   ];
+    # };
 
     virtualHosts."${domainPublic}" = {
       enableACME = true;
@@ -30,24 +32,26 @@ in
     };
   };
 
-  services.cgit.internal = {
-    enable = false;
-    user = "cgit-internal";
-    group = "cgit";
-    nginx.virtualHost = domainInternal;
-    gitHttpBackend.checkExportOkFiles = false;
-    scanPath = "/var/lib/git/repos/isabella";
-    settings = commonSettings;
-  };
+  # services.cgit.internal = {
+  #   enable = false;
+  #   user = "cgit-internal";
+  #   group = "cgit";
+  #   nginx.virtualHost = domainInternal;
+  #   gitHttpBackend.checkExportOkFiles = false;
+  #   scanPath = "/var/lib/git/repos/isabella";
+  #   settings = commonSettings;
+  # };
 
   services.cgit.public = {
-    enable = false;
+    enable = true;
     user = "cgit-public";
     group = "cgit";
     nginx.virtualHost = domainPublic;
     gitHttpBackend.checkExportOkFiles = false;
     repos = {
       futils.path = "/var/lib/git/repos/isabella/futils";
+      sorre-website.path = "/var/lib/git/repos/isabella/sorre-website";
+      xpkgs.path = "/var/lib/git/repos/isabella/xpkgs";
       nixos-config.path = "/var/lib/git/repos/isabella/nixos-config";
     };
     settings = commonSettings;