From a0ed02d1587a56e81fe41adc2fbe3563129e1210 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sat, 8 Feb 2025 12:05:33 -0600
Subject: [PATCH] bert: Add www redirect for stjohnscccc.org

---
 bert/services/http/stjohnscccc.org.nix | 37 ++++++++++++++------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/bert/services/http/stjohnscccc.org.nix b/bert/services/http/stjohnscccc.org.nix
index c76faf8..de32cea 100644
--- a/bert/services/http/stjohnscccc.org.nix
+++ b/bert/services/http/stjohnscccc.org.nix
@@ -15,28 +15,31 @@
     };
     # phpEnv."PATH" = lib.makeBinPath [ pkgs.php ];
   };
-  services.caddy.virtualHosts."stjohnscccc.org".extraConfig = ''
-    root * /srv/www/stjohnscccc.org/public
+  services.caddy.virtualHosts."stjohnscccc.org" = {
+    serverAliases = ["www.stjohnscccc.org"];
+    extraConfig = ''
+      root * /srv/www/stjohnscccc.org/public
 
-    redir /downloads /downloads/
+      redir /downloads /downloads/
 
-    handle /downloads/* {
-      file_server {
-        browse ${./caddy-browse-template.html}
-        hide .gitignore
+      handle /downloads/* {
+        file_server {
+          browse ${./caddy-browse-template.html}
+          hide .gitignore
+        }
       }
-    }
 
-    handle {
-      encode zstd gzip
-      php_fastcgi unix/${config.services.phpfpm.pools.stjohnscccc.socket}
-      file_server
-    }
+      handle {
+        encode zstd gzip
+        php_fastcgi unix/${config.services.phpfpm.pools.stjohnscccc.socket}
+        file_server
+      }
 
-    handle_errors {
-      respond "{err.status_code} {err.status_text}"
-    }
-  '';
+      handle_errors {
+        respond "{err.status_code} {err.status_text}"
+      }
+    '';
+  };
   users.users.stjohnscccc = {
     isSystemUser = true;
     home = "/srv/www/stjohnscccc.org";