From 3618954431f39923c9137dd126e41a02babb720f Mon Sep 17 00:00:00 2001
From: david <davidcrompton@duck.com>
Date: Fri, 21 Aug 2026 10:42:25 -0400
Subject: [PATCH] kcnhub: gitea -> forgejo

---
 machines/kcnhub/servers.nix         |  1 -
 machines/kcnhub/servers/forgejo.nix | 12 +++---
 machines/kcnhub/servers/gitea.nix   | 65 -----------------------------
 3 files changed, 6 insertions(+), 72 deletions(-)
 delete mode 100644 machines/kcnhub/servers/gitea.nix

diff --git a/machines/kcnhub/servers.nix b/machines/kcnhub/servers.nix
index 29e3668..40c8c0d 100644
--- a/machines/kcnhub/servers.nix
+++ b/machines/kcnhub/servers.nix
@@ -3,7 +3,6 @@
     # Reverse Proxying of Forward Facing Servers
     ./servers/caddy.nix
     # Git Instances for WS-KCNHUB Projects
-    ./servers/gitea.nix
     ./servers/forgejo.nix
     # Online Remote Connectivity
     ./servers/guac.nix
diff --git a/machines/kcnhub/servers/forgejo.nix b/machines/kcnhub/servers/forgejo.nix
index 39fec16..678a14d 100644
--- a/machines/kcnhub/servers/forgejo.nix
+++ b/machines/kcnhub/servers/forgejo.nix
@@ -1,6 +1,6 @@
 { pkgs, config, ...}: let
   # Domain TBD
-  domain = "git2.ws.kcnhub.com";
+  domain = "git.ws.kcnhub.com";
 in {
   services.forgejo = {
     enable = true;
@@ -54,11 +54,11 @@ in {
     }];
   };
   services.caddy.virtualHosts = {
-#    "ws.kcnhub.com" = {
-#      extraConfig = ''
-#        redir "https://git.ws.kcnhub.com/DavidC/WS-KCNHUB/wiki"
-#      '';
-#    };
+    "ws.kcnhub.com" = {
+      extraConfig = ''
+        redir "https://git.ws.kcnhub.com/KCNHUB/WS-KCNHUB/wiki"
+      '';
+    };
     "${domain}" = {
       extraConfig = ''
         reverse_proxy 127.0.0.1:${toString config.services.forgejo.settings.server.HTTP_PORT}
diff --git a/machines/kcnhub/servers/gitea.nix b/machines/kcnhub/servers/gitea.nix
deleted file mode 100644
index 256bce1..0000000
--- a/machines/kcnhub/servers/gitea.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ pkgs, config, ...}: let
-  # Domain TBD
-  domain = "git.ws.kcnhub.com";
-in {
-  services.gitea = {
-    enable = true;
-    database = {
-      type = "postgres";
-      socket = "/run/postgresql";
-    };
-    settings = {
-      server = {
-        HTTP_PORT = 5000;
-        ROOT_URL = "https://${domain}";
-      };
-      actions = {
-        ENABLED = true;
-      };
-      service.DISABLE_REGISTRATION = true;
-    };
-  };
-
-  # To allow gitea to access /etc/shadow for PAM authentication
-  users.users.gitea.extraGroups = [ "shadow" ];
-
-  # Services Runner running in nixos-container w/ host label
-  # This allows sharing of nix-store for caching actions builds
-  # ... Maybe I'll actually set this up. Some concern for clearing its
-  # cache and it overpopulating. Idk. We'll see.
-  # services.gitea-actions-runner.instances."nix-runner" = {
-  #   enable = true;
-  #   name = "nix-runner";
-  #   url = "http://localhost:${config.services.gitea.settings.server.HTTP_PORT}";
-  #   labels = [
-  #     # don't require docker/podman
-  #     "native:host"
-  #   ];
-  #   tokenFile = "/var/lib/gitea/runner_token";
-  # };
-  
-  services.postgresql = {
-    enable = true;
-    port = 5432;
-    ensureUsers = [{
-      name = "gitea";
-      # Ensures gitea user owns a db called gitea
-      ensureDBOwnership = true;
-      ensureClauses = {
-        createdb = true;
-      };
-    }];
-  };
-  services.caddy.virtualHosts = {
-    "ws.kcnhub.com" = {
-      extraConfig = ''
-        redir "https://git.ws.kcnhub.com/DavidC/WS-KCNHUB/wiki"
-      '';
-    };
-    "${domain}" = {
-      extraConfig = ''
-        reverse_proxy 127.0.0.1:${toString config.services.gitea.settings.server.HTTP_PORT}
-      '';           
-    };
-  };
-}