caddy user serverAliases for main landing page

services/caddy.nix

@@ -3,15 +3,11 @@
   services.caddy = {
     enable = true;
     email = "evie@xenia.me.uk";
-    virtualHosts = {
+    virtualHosts."xenia.me.uk" = {
-      "xenia.me.uk".extraConfig = ''
+      serverAliases = ["www.xenia.me.uk"];
+      extraConfig = ''
         redir https://www.xenia.me.uk
       '';
-      "www.xenia.me.uk".extraConfig = ''
-        file_server * {
-          root /var/www/xenia.me.uk/
-        }
-      '';
     };
   };
   services.fail2ban = {

services/znc.nix

@@ -1,5 +1,5 @@
 {config, ...}: {
-  imports = [./caddy.nix];
+  # imports = [./caddy.nix];
   services.znc = {
     enable = true;
     mutable = false;
@@ -16,17 +16,17 @@
           Salt = "0vgs)x4KcEmGMK;56QVm";
         };
         Network = {
-          liberachat = {
+          # liberachat = {
-            Server = "irc.libera.chat +6697";
+          #   Server = "irc.libera.chat +6697";
-            Chan = {
+          #   Chan = {
-              "#nixos" = {};
+          #     "#nixos" = {};
-              "#nixos-wiki" = {};
+          #     "#nixos-wiki" = {};
-            };
+          #   };
-            JoinDelay = 2;
+          #   JoinDelay = 2;
-          };
+          # };
         };
       };
     };
   };
-  services.caddy.virtualHosts."znc.xenia.me.uk".extraConfig = "reverse_proxy http://localhost:${toString config.services.znc.config.Listener.l.Port}";
+  # services.caddy.virtualHosts."znc.xenia.me.uk".extraConfig = "reverse_proxy http://localhost:${toString config.services.znc.config.Listener.l.Port}";
 }