From 924766af58349feee76fccd165d4604f1cdc1e5c Mon Sep 17 00:00:00 2001
From: Gene Liverman <gene@technicalissues.us>
Date: Tue, 28 Jan 2025 22:19:16 -0500
Subject: [PATCH] Actually listen on port 80, redirect to https

---
 .../hosts/nixos/hetznix01/post-install/nginx.nix    | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/modules/hosts/nixos/hetznix01/post-install/nginx.nix b/modules/hosts/nixos/hetznix01/post-install/nginx.nix
index bebfa6c..f5366ba 100644
--- a/modules/hosts/nixos/hetznix01/post-install/nginx.nix
+++ b/modules/hosts/nixos/hetznix01/post-install/nginx.nix
@@ -1,5 +1,6 @@
 { config, ... }: let 
   domain = "technicalissues.us";
+  http_port = 80;
   https_port = 443;
 in {
 
@@ -18,10 +19,6 @@ in {
       }
       add_header Strict-Transport-Security $hsts_header;
     '';
-    defaultListen = [
-      { port = https_port; addr = "0.0.0.0"; ssl = true; }
-      { port = https_port; addr = "[::]"; ssl = true; }
-    ];
     virtualHosts = {
       "hetznix01.${domain}" = {
         serverAliases = [
@@ -69,10 +66,6 @@ in {
         };
       };
       "albyhub.${domain}" = {
-        listen = [
-          { port = https_port; addr = "0.0.0.0"; ssl = true; }
-          { port = https_port; addr = "[::]"; ssl = true; }
-        ];
         enableACME = true;
         acmeRoot = null;
         forceSSL = true;
@@ -85,8 +78,12 @@ in {
       };
       "matrix.${domain}" = {
         listen = [
+          { port = http_port; addr = "0.0.0.0"; }
+          { port = http_port; addr = "[::]"; }
+
           { port = https_port; addr = "0.0.0.0"; ssl = true; }
           { port = https_port; addr = "[::]"; ssl = true; }
+
           { port = 8448; addr = "0.0.0.0"; ssl = true; }
           { port = 8448; addr = "[::]"; ssl = true; }
         ];