fix issues with caddy config

2 files changed, 16 insertions, 2 deletions

diff --git a/hosts/ganymede/caddy.nix b/hosts/ganymede/caddy.nix
index b24e906..8f4fe94 100644
--- a/hosts/ganymede/caddy.nix
+++ b/hosts/ganymede/caddy.nix
@@ -19,8 +19,8 @@
       }
     '';
 
-    virtualHosts."https://williamsfam.us.com".extraConfig = ''
-      root * /media/www
+    virtualHosts."williamsfam.us.com".extraConfig = ''
+      root * /media/public/www
       file_server
     '';
   };
diff --git a/hosts/ganymede/nixos.nix b/hosts/ganymede/nixos.nix
index 6bfd296..92eeb60 100644
--- a/hosts/ganymede/nixos.nix
+++ b/hosts/ganymede/nixos.nix
@@ -1,5 +1,7 @@
 {
   config,
+  pkgs,
+  lib,
   inputs,
   ...
 }: {
@@ -21,8 +23,20 @@
     networkConfig.DHCP = "yes";
   };
 
+  systemd.services."disable-wifi-powersave" = {
+    description = "Disable wifi powersaving using iw";
+    after = ["network.target"];
+    serviceConfig.ExecStart = "${pkgs.iw}/bin/iw dev wlp108s0 set power_save off";
+    wantedBy = ["default.target"];
+  };
+
   services.fail2ban.enable = true;
 
+  # merge logs from subdomains
+  services.caddy.virtualHosts."up.williamsfam.us.com".logFormat = lib.mkForce ''
+    output file /var/log/caddy/access-williamsfam.us.com.log
+  '';
+
   # i broke something and this fixes it
   environment.etc."systemd/resolved.conf.d/10-dns.conf".text = config.environment.etc."systemd/resolved.conf".text;
 }