2 files changed, 36 insertions, 22 deletions
diff --git a/hosts/cloud/sortug/gitea.nix b/hosts/cloud/sortug/gitea.nix
index a25773a..f86ab5d 100644
--- a/hosts/cloud/sortug/gitea.nix
+++ b/hosts/cloud/sortug/gitea.nix
@@ -1,27 +1,40 @@
-{ 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 = {
+    # user = "gitolite";
+    enable = true;
+    extraConfig = ''
+      robots=noindex
+    '';
+    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