From 58982e77417f18d70cc03a75999f9f629667483c Mon Sep 17 00:00:00 2001
From: DerGrumpf <phil.keier@hotmail.com>
Date: Sat, 25 Apr 2026 03:00:17 +0200
Subject: [PATCH] Fixed Nginx Config

---
 nixos/roles/nginx.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/nixos/roles/nginx.nix b/nixos/roles/nginx.nix
index 64ee744..c4e3dd4 100644
--- a/nixos/roles/nginx.nix
+++ b/nixos/roles/nginx.nix
@@ -22,15 +22,6 @@ let
       };
     };
 
-  # helper: no forceSSL (for internal/non-redirected hosts)
-  mkWsProxyNoSSL = port: {
-    enableACME = true;
-    locations."/" = {
-      proxyPass = "http://${upstream}:${toString port}";
-      proxyWebsockets = true;
-    };
-  };
-
   matrixConfig = ''
     client_max_body_size 50M;
     proxy_set_header X-Forwarded-For $remote_addr;
@@ -82,6 +73,7 @@ in
       "fluffy.cyperpunk.de" = mkWsProxy 8012;
 
       "www.cyperpunk.de" = {
+        forceSSL = true;
         enableACME = true;
         locations = {
           "/" = {
@@ -95,9 +87,9 @@ in
         };
       };
 
-      "calvin.cyperpunk.de" = mkWsProxyNoSSL 15006;
-      "cinny.cyperpunk.de" = mkWsProxyNoSSL 8009;
-      "element.cyperpunk.de" = mkWsProxyNoSSL 8010;
+      "calvin.cyperpunk.de" = mkWsProxy 15006;
+      "cinny.cyperpunk.de" = mkWsProxy 8009;
+      "element.cyperpunk.de" = mkWsProxy 8010;
 
       "cyperpunk.de" = {
         forceSSL = true;