everything is working now

1 files changed, 53 insertions, 16 deletions

diff --git a/hosts/ganymede/caddy.nix b/hosts/ganymede/caddy.nix
index 06ca720..961b3b2 100644
--- a/hosts/ganymede/caddy.nix
+++ b/hosts/ganymede/caddy.nix
@@ -1,8 +1,12 @@
 {
   pkgs,
   lib,
+  hosts,
+  config,
   ...
 }: {
+  users.users."caddy".extraGroups = ["fileserver"];
+
   services.caddy = {
     package = lib.mkForce (pkgs.caddy.withPlugins {
       plugins = [
@@ -17,30 +21,63 @@
         api_key {env.PORKBUN_API_KEY}
         api_secret_key {env.PORKBUN_API_SECRET_KEY}
       }
+
+      pki {
+        ca local {
+          name "Ganymede Home CA"
+
+          root {
+              format pem_file
+              cert ${pkgs.writeText "caddy-root-ca.crt" hosts.ganymede.caddy-root-ca}
+              key ${config.collinux.secrets.caddy-root-ca-key.path}
+          }
+        }
+      }
     '';
 
     virtualHosts = {
-      "lindsey.williamsfam.us.com".extraConfig = ''
-        redir https://williams-ryan-lindsey.blogspot.com permanent
-      '';
+      "jta.williamsfam.us.com" = {
+        logFormat = lib.mkForce ''
+          output file /var/log/caddy/access-williamsfam.us.com.log
+        '';
+        extraConfig = ''
+          root * /media/public/www/jta
 
-      "daniel.williamsfam.us.com".extraConfig = ''
-        root * /media/public/www/daniel
-        file_server
-      '';
+          @hidden path */.*
+          respond @hidden "Not Found" 404
 
-      "williamsfam.us.com".extraConfig = ''
-        root * /media/public/www/root
-        file_server
-      '';
+          file_server
+        '';
+      };
+      "lindsey.williamsfam.us.com" = {
+        logFormat = lib.mkForce ''
+          output file /var/log/caddy/access-williamsfam.us.com.log
+        '';
+        extraConfig = ''
+          redir https://williams-ryan-lindsey.blogspot.com permanent
+        '';
+      };
+      "daniel.williamsfam.us.com" = {
+        logFormat = lib.mkForce ''
+          output file /var/log/caddy/access-williamsfam.us.com.log
+        '';
+        extraConfig = ''
+          root * /media/public/www/daniel
+          file_server
+        '';
+      };
+      "williamsfam.us.com" = {
+        logFormat = lib.mkForce ''
+          output file /var/log/caddy/access-williamsfam.us.com.log
+        '';
+        extraConfig = ''
+          root * /media/public/www/root
+          file_server
+        '';
+      };
     };
   };
 
-  # merge logs from subdomains
-  services.caddy.virtualHosts."jta.williamsfam.us.com".logFormat = lib.mkForce ''
-    output file /var/log/caddy/access-williamsfam.us.com.log
-  '';
-
   collinux.services.glance.homelabServices."website" = {
     url = "https://williamsfam.us.com";
     icon = "mdi:web";