ctucx.git: nixfiles

machines/hector/websites: add `katja.wtf`

diff --git a/machines/hector/websites/ctu.cx.nix b/machines/hector/websites/ctu.cx.nix
@@ -2,7 +2,7 @@
 
 {
 
-  dns.zones."ctu.cx" =  (pkgs.dns.lib.combinators.host config.networking.primaryIP4 config.networking.primaryIP);
+  dns.zones."ctu.cx" = (pkgs.dns.lib.combinators.host config.networking.primaryIP4 config.networking.primaryIP);
 
   services.nginx = {
     enable = true;

@@ -10,11 +10,9 @@
       enableACME = true;
       forceSSL   = true;
       kTLS       = true;
-      root       = pkgs.ctucx-website;
-      locations  = {
-        "/netzabdeckung.html".return = "307 https://wifionic.de/";
-        "/bikemap".return = "307 https://bikemap.ctu.cx/";
-      };
+      locations."/".extraConfig = ''
+        return 307 https://katja.wtf$request_uri;
+      '';
     };
   };
 

diff --git a/machines/hector/websites/default.nix b/machines/hector/websites/default.nix
@@ -3,6 +3,7 @@
 {
 
   imports = [
+    ./katja.wtf.nix
     ./ctu.cx.nix
     ./things.ctu.cx.nix
     ./bikemap.ctu.cx.nix

diff --git a/machines/hector/websites/katja.wtf.nix b/machines/hector/websites/katja.wtf.nix
@@ -0,0 +1,17 @@
+{ pkgs, lib, config, ...}:
+
+{
+
+  dns.zones."katja.wtf" = (pkgs.dns.lib.combinators.host config.networking.primaryIP4 config.networking.primaryIP);
+
+  services.nginx = {
+    enable = true;
+    virtualHosts."katja.wtf" = {
+      enableACME = true;
+      forceSSL   = true;
+      kTLS       = true;
+      root       = pkgs.ctucx-website;
+    };
+  };
+
+}