From 20f3be93deff1be26c71fbf8d3138c5d35fd48ae Mon Sep 17 00:00:00 2001
From: chfour <chfourchfour@protonmail.com>
Date: Tue, 21 Oct 2025 19:58:46 +0200
Subject: [PATCH] split off website stuff into its own file

---
 machines/fovps/services/caddy/default.nix | 34 +++--------------------
 machines/fovps/services/caddy/website.nix | 34 +++++++++++++++++++++++
 2 files changed, 38 insertions(+), 30 deletions(-)
 create mode 100644 machines/fovps/services/caddy/website.nix

diff --git a/machines/fovps/services/caddy/default.nix b/machines/fovps/services/caddy/default.nix
index 5a1f722..81f0bf5 100644
--- a/machines/fovps/services/caddy/default.nix
+++ b/machines/fovps/services/caddy/default.nix
@@ -1,9 +1,6 @@
-{ pkgs, config, website, ... }:
+{ pkgs, config, ... }:
 
 let
-  websiteDest = "${config.services.caddy.dataDir}/website";
-  websitePath = builtins.toString website.website.out;
-
   disallowedAgents = [
     # https://git.madhouse-project.org/iocaine/nam-shub-of-enki/src/branch/main/org/module
     # https://momenticmarketing.com/blog/ai-search-crawlers-bots
@@ -39,6 +36,9 @@ let
     # apparently that also blocks normal googlebot. oops!
   ];
 in {
+  imports = [
+    ./website.nix
+  ];
   services.caddy.enable = true;
   services.caddy.extraConfig = let
     agentsRegex = with pkgs; "(?i)" + lib.strings.escape [ "'" "\\" ]
@@ -68,15 +68,6 @@ in {
     }
   '';
   services.caddy.virtualHosts = {
-    "eeep.ee".extraConfig = ''
-      import errors
-      import bots
-
-      root * ${websiteDest}
-      encode zstd gzip
-      file_server
-    '';
-
     "files.eeep.ee".extraConfig = ''
       import errors
       import bots
@@ -88,23 +79,6 @@ in {
       }
     '';
   };
-
-  system.activationScripts = {
-    copyWebsite = {
-      text = ''
-        # epic hack hacky hackk
-        mkdir -p ${websiteDest}
-        ${pkgs.lib.getExe pkgs.rsync} -r --copy-links --delete \
-          ${websitePath}/var/www/ ${websiteDest}
-
-        # :trol:
-        ${pkgs.lib.getExe pkgs.gnused} -i \
-          's|/nix/store/VERY5p3c14lsecretv4luereplaceme0-chfour-website|${websitePath}|' \
-          ${websiteDest}/index.html
-      '';
-      deps = [];
-    };
-  };
   networking.firewall.allowedTCPPorts = [ 80 443 ];
   networking.firewall.allowedUDPPorts = [ 80 443 ];
 }
diff --git a/machines/fovps/services/caddy/website.nix b/machines/fovps/services/caddy/website.nix
new file mode 100644
index 0000000..ea7932b
--- /dev/null
+++ b/machines/fovps/services/caddy/website.nix
@@ -0,0 +1,34 @@
+{ pkgs, config, website, ... }:
+
+let
+  websiteDest = "${config.services.caddy.dataDir}/website";
+  websitePath = builtins.toString website.website.out;
+in
+{
+  services.caddy.virtualHosts = {
+    "eeep.ee".extraConfig = ''
+      import errors
+      import bots
+
+      root * ${websiteDest}
+      encode zstd gzip
+      file_server
+    '';
+  };
+  system.activationScripts = {
+    copyWebsite = {
+      text = ''
+        # epic hack hacky hackk
+        mkdir -p ${websiteDest}
+        ${pkgs.lib.getExe pkgs.rsync} -r --copy-links --delete \
+          ${websitePath}/var/www/ ${websiteDest}
+
+        # :trol:
+        ${pkgs.lib.getExe pkgs.gnused} -i \
+          's|/nix/store/VERY5p3c14lsecretv4luereplaceme0-chfour-website|${websitePath}|' \
+          ${websiteDest}/index.html
+      '';
+      deps = [];
+    };
+  };
+}
-- 
2.51.2