From b0247d330e66341004202965351ffb3342055be9 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Fri, 17 Jan 2025 19:55:34 -0500
Subject: [PATCH] Redirect jimfiles and nixfox to www

---
 .../webserver/nginx/virtualhosts/p1/default.nix   |  1 +
 .../webserver/nginx/virtualhosts/p2/default.nix   | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/system/services/server/webserver/nginx/virtualhosts/p1/default.nix b/modules/system/services/server/webserver/nginx/virtualhosts/p1/default.nix
index 364ee40..4a45e0a 100644
--- a/modules/system/services/server/webserver/nginx/virtualhosts/p1/default.nix
+++ b/modules/system/services/server/webserver/nginx/virtualhosts/p1/default.nix
@@ -3,6 +3,7 @@
   services.nginx.virtualHosts."${config.domains.p1}" = lib.mkIf config.system.server.enable {
     enableACME = true;
     addSSL = true;
+    globalRedirect = "www.${config.domains.p2}";
     locations = {
       "/.well-known/matrix/client".extraConfig = ''
         default_type application/json;
diff --git a/modules/system/services/server/webserver/nginx/virtualhosts/p2/default.nix b/modules/system/services/server/webserver/nginx/virtualhosts/p2/default.nix
index 2b910cc..fc87c4f 100644
--- a/modules/system/services/server/webserver/nginx/virtualhosts/p2/default.nix
+++ b/modules/system/services/server/webserver/nginx/virtualhosts/p2/default.nix
@@ -1,8 +1,15 @@
 { config, lib, ... }:
 {
-  services.nginx.virtualHosts."${config.domains.p2}" = lib.mkIf config.system.server.enable {
-    enableACME = true;
-    addSSL = true;
-    root = "/var/www/landing-page";
+  services.nginx.virtualHosts = lib.mkIf config.system.server.enable {
+    "www.${config.domains.p2}" = {
+      enableACME = true;
+      addSSL = true;
+      root = "/var/www/landing-page";
+    };
+    "${config.domains.p2}" = {
+      enableACME = true;
+      addSSL = true;
+      globalRedirect = "www.${config.domains.p2}";
+    };
   };
 }