From d46ce2d93eb1bf7183b3cdf4c693b3415a1ef742 Mon Sep 17 00:00:00 2001 From: DerGrumpf Date: Tue, 28 Apr 2026 22:30:31 +0200 Subject: [PATCH] WIP: Livekit; added ngx.cyperpunk.de host --- hosts/cyper-proxy/configuration.nix | 7 +++++++ nixos/roles/livekit.nix | 3 ++- nixos/roles/nginx.nix | 11 +++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/hosts/cyper-proxy/configuration.nix b/hosts/cyper-proxy/configuration.nix index 75f2ddd..0436356 100644 --- a/hosts/cyper-proxy/configuration.nix +++ b/hosts/cyper-proxy/configuration.nix @@ -29,6 +29,13 @@ 443 ]; + hosts = { + "178.254.8.35" = [ + "cyperpunk.de" + "matrix.cyperpunk.de" + ]; + }; + }; system.stateVersion = "26.05"; diff --git a/nixos/roles/livekit.nix b/nixos/roles/livekit.nix index c5c8a71..bf2dbf2 100644 --- a/nixos/roles/livekit.nix +++ b/nixos/roles/livekit.nix @@ -34,8 +34,9 @@ in lk-jwt-service = { enable = true; - livekitUrl = "ws://127.0.0.1:7880"; + #livekitUrl = "wss://cyperpunk.de/livekit/sfu"; inherit keyFile; + livekitUrl = "wss://127.0.0.1:7880"; }; }; diff --git a/nixos/roles/nginx.nix b/nixos/roles/nginx.nix index e521389..f96e7ba 100644 --- a/nixos/roles/nginx.nix +++ b/nixos/roles/nginx.nix @@ -78,6 +78,7 @@ in "git.cyperpunk.de" = mkProxy 9000; "search.cyperpunk.de" = mkProxy 11080; "file.cyperpunk.de" = mkProxy 10000; + "ngx.cyperpunk.de" = mkWsProxy 28101; "vault.cyperpunk.de" = mkWsProxy 8222; "fluffy.cyperpunk.de" = mkWsProxy 8012; @@ -100,6 +101,7 @@ in "calvin.cyperpunk.de" = mkWsProxy 15006; "cinny.cyperpunk.de" = mkWsProxy 8009; "element.cyperpunk.de" = mkWsProxy 8010; + "element-call.cyperpunk.de" = mkWsProxy 8013; "cyperpunk.de" = { forceSSL = true; @@ -112,13 +114,13 @@ in proxyPass = "http://${upstream}:8008"; proxyWebsockets = true; }; - "^~ /livekit/jwt" = { + "^~ /livekit/jwt/" = { priority = 400; - proxyPass = "http://127.0.0.1:8080"; + proxyPass = "http://127.0.0.1:8080/"; }; - "^~ /livekit/sfu" = { + "^~ /livekit/sfu/" = { priority = 400; - proxyPass = "http://127.0.0.1:7880"; + proxyPass = "http://127.0.0.1:7880/"; proxyWebsockets = true; extraConfig = '' proxy_set_header Host $host; @@ -127,6 +129,7 @@ in proxy_set_header X-Forwarded-Proto $scheme; proxy_read_timeout 86400s; proxy_send_timeout 86400s; + ''; }; };