3 files changed, 41 insertions, 26 deletions
diff --git a/hosts/cloud/sortug/gitea.nix b/hosts/cloud/sortug/gitea.nix
index a25773a..05f304c 100644
--- a/hosts/cloud/sortug/gitea.nix
+++ b/hosts/cloud/sortug/gitea.nix
@@ -1,27 +1,42 @@
-{ config, ...}:
-{
-  services.gitea = {
+{...}: {
+  # services.gitea = {
+  #   enable = true;
+  #   user = "git";
+  #   appName = "Sortug Git";
+  #   settings.server = {
+  #     domain = "git.sortug.com";
+  #     ROOT_URL = "https://git.sortug.com/";
+  #     SSH_PORT = 5522;
+  #   };
+  #   lfs.enable = true;
+  # };
+
+  # users.users = {
+  #   git = {
+  #     description = "Gitea Service";
+  #     home = "/var/lib/gitea";
+  #     useDefaultShell = true;
+  #     group = "gitea";
+  #     isSystemUser = true;
+  #   };
+  # };
+
+  services.gitolite = {
     enable = true;
-    user = "git";
-    appName = "Sortug Git"; 
-    settings.server = {
-      domain = "git.sortug.com";
-      ROOT_URL = "https://git.sortug.com/";
-      SSH_PORT = 5522;
-    };
-    lfs.enable = true;
+    adminPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICbdwmBis6Ss6xuDFvIsBE4foQfYECgl0pR60sIzLNtV";
   };
-  
-  users.users = {
-    git = {
-      description = "Gitea Service";
-      home = "/var/lib/gitea";
-      useDefaultShell = true;
-      group = "gitea";
-      isSystemUser = true;
+  services.cgit.y = {
+    enable = true;
+    user = "gitolite";
+    group = "gitolite";
+    # extraConfig = ''
+    #   robots=noindex, nofollow
+    # logo=/var/lib/sortug-logo.png
+    # '';
+    scanPath = "/var/lib/gitolite/repositories";
+    nginx = {
+      virtualHost = "git.sortug.com";
+      location = "/";
     };
   };
-
-
-
 }
diff --git a/hosts/cloud/sortug/mail.nix b/hosts/cloud/sortug/mail.nix
index ef10866..68a960a 100644
--- a/hosts/cloud/sortug/mail.nix
+++ b/hosts/cloud/sortug/mail.nix
@@ -6,6 +6,7 @@
   # services.dovecot2.sieve.extensions = ["fileinto"];
   mailserver = {
     enable = true;
+    stateVersion = 1;
     fqdn = "mail.sortug.com";
     domains = ["sortug.com" "yago.onl"];
     # workaround
diff --git a/hosts/cloud/sortug/nginx.nix b/hosts/cloud/sortug/nginx.nix
index 5c129fb..86bc03e 100644
--- a/hosts/cloud/sortug/nginx.nix
+++ b/hosts/cloud/sortug/nginx.nix
@@ -16,12 +16,11 @@
       # root = "/home/y/www";
     };
     virtualHosts."git.sortug.com" = {
+      # basicAuth = {yuanshikai = "seegit";};
+      proxyPass = "http://127.0.0.1:3000";
+      proxyWebsockets = true; # needed if you need to use WebSocket
       enableACME = true;
       forceSSL = true;
-      locations."/" = {
-        proxyPass = "http://127.0.0.1:3000";
-        proxyWebsockets = true; # needed if you need to use WebSocket
-      };
     };
     virtualHosts."ai.sortug.com" = {
       enableACME = true;