From 77b8c837c5e9a5217e829ae2976a37e691a291b5 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sun, 3 Sep 2023 11:58:42 +0200
Subject: l coms proxy: ipforward ports

---
 lass/2configs/services/coms/proxy.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'lass/2configs/services/coms/proxy.nix')

diff --git a/lass/2configs/services/coms/proxy.nix b/lass/2configs/services/coms/proxy.nix
index e8555f9b7..fd7b36ca8 100644
--- a/lass/2configs/services/coms/proxy.nix
+++ b/lass/2configs/services/coms/proxy.nix
@@ -21,14 +21,13 @@ in
         proxy_pass ${target}:${toString port};
       }
     '') tcpports}
-    ${lib.concatMapStringsSep "\n" (port: ''
-      server {
-        listen ${toString port} udp;
-        proxy_pass ${target}:${toString port};
-      }
-    '') udpports}
   '';
 
+  krebs.iptables.tables.nat.PREROUTING.rules = lib.flatten (map (port: [
+    { predicate = "-p udp --dport ${toString port}"; target = "DNAT --to-destination ${config.krebs.hosts.orange.nets.retiolum.ip4.addr}:${toString port}"; v6 = false; }
+    { predicate = "-p udp --dport ${toString port}"; target = "DNAT --to-destination [${config.krebs.hosts.orange.nets.retiolum.ip6.addr}]:${toString port}"; v4 = false; }
+  ]) udpports);
+
   services.nginx.virtualHosts."jitsi.lassul.us" = {
     enableACME = true;
     acmeFallbackHost = "${target}";
@@ -36,7 +35,7 @@ in
     locations."/" = {
       recommendedProxySettings = true;
       proxyWebsockets = true;
-      proxyPass = "http://${target}";
+      proxyPass = "https://${target}";
     };
   };
 }
-- 
cgit v1.2.3


From f55307fd73af235069744dd5155fda0bc73fe613 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Thu, 7 Sep 2023 12:26:31 +0200
Subject: lass: migrate away

---
 lass/2configs/services/coms/proxy.nix | 41 -----------------------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 lass/2configs/services/coms/proxy.nix

(limited to 'lass/2configs/services/coms/proxy.nix')

diff --git a/lass/2configs/services/coms/proxy.nix b/lass/2configs/services/coms/proxy.nix
deleted file mode 100644
index fd7b36ca8..000000000
--- a/lass/2configs/services/coms/proxy.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  tcpports = [
-    4443 # jitsi
-    64738 # murmur
-  ];
-  udpports = [
-    10000 # jitsi
-    64738 # murmur
-  ];
-  target = "orange.r";
-in
-{
-  networking.firewall.allowedTCPPorts = tcpports;
-  networking.firewall.allowedUDPPorts = udpports;
-  services.nginx.streamConfig = ''
-    ${lib.concatMapStringsSep "\n" (port: ''
-      server {
-        listen [::]:${toString port};
-        listen ${toString port};
-        proxy_pass ${target}:${toString port};
-      }
-    '') tcpports}
-  '';
-
-  krebs.iptables.tables.nat.PREROUTING.rules = lib.flatten (map (port: [
-    { predicate = "-p udp --dport ${toString port}"; target = "DNAT --to-destination ${config.krebs.hosts.orange.nets.retiolum.ip4.addr}:${toString port}"; v6 = false; }
-    { predicate = "-p udp --dport ${toString port}"; target = "DNAT --to-destination [${config.krebs.hosts.orange.nets.retiolum.ip6.addr}]:${toString port}"; v4 = false; }
-  ]) udpports);
-
-  services.nginx.virtualHosts."jitsi.lassul.us" = {
-    enableACME = true;
-    acmeFallbackHost = "${target}";
-    addSSL = true;
-    locations."/" = {
-      recommendedProxySettings = true;
-      proxyWebsockets = true;
-      proxyPass = "https://${target}";
-    };
-  };
-}
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/ef100000.lock: No such file or directory (2)