From 5e171d9c06b56630424cc96424ac1eeb7b6654e9 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Mon, 30 Jun 2025 12:26:19 +0200
Subject: [PATCH] fix(etna): switch forgejo to vesuvio proxy

ssh url now matches https!!! yay!!!
---
 systems/etna/forgejo.nix  | 8 ++++----
 systems/vesuvio/nginx.nix | 9 +++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/systems/etna/forgejo.nix b/systems/etna/forgejo.nix
index 30bf9fa..ee534c1 100644
--- a/systems/etna/forgejo.nix
+++ b/systems/etna/forgejo.nix
@@ -20,8 +20,6 @@ in
 {
   imports = [ secrets.generate ];
 
-  cfTunnels."git.uku3lig.net" = "http://localhost:3000";
-
   services = {
     forgejo = {
       enable = true;
@@ -42,9 +40,11 @@ in
 
         server = {
           ROOT_URL = "https://git.uku3lig.net";
+          HTTP_ADDR = "0.0.0.0";
+          HTTP_PORT = 3000;
           START_SSH_SERVER = true;
           BUILTIN_SSH_SERVER_USER = "git";
-          SSH_DOMAIN = "ssh.uku.moe";
+          SSH_DOMAIN = "git.uku3lig.net";
           SSH_LISTEN_PORT = 2222;
         };
 
@@ -120,7 +120,7 @@ in
         name = "forgejo-ssh";
         type = "tcp";
         localIp = "127.0.0.1";
-        localPort = 2222;
+        localPort = config.services.forgejo.settings.server.SSH_LISTEN_PORT;
         remotePort = 22;
       }
     ];
diff --git a/systems/vesuvio/nginx.nix b/systems/vesuvio/nginx.nix
index 74d7033..57ef76f 100644
--- a/systems/vesuvio/nginx.nix
+++ b/systems/vesuvio/nginx.nix
@@ -75,6 +75,15 @@
           client_max_body_size 1000M;
         '';
       };
+
+      "git.uku3lig.net" = {
+        forceSSL = true;
+        enableACME = true;
+        locations."/" = {
+          proxyPass = "http://etna:3000";
+          recommendedProxySettings = true;
+        };
+      };
     };
   };