From fee81ed3c717d1037fc3e1d0e57e0c20cb5d8d97 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Tue, 5 Nov 2024 23:48:09 -0600
Subject: [PATCH] Move /srv/* into /srv/www/*

---
 bert/services/http/files.chandlerswift.com.nix | 4 ++--
 bert/services/http/home.chandlerswift.com.nix  | 4 ++--
 bert/services/http/maps.chandlerswift.com.nix  | 4 ++--
 bert/services/http/stjohnscccc.org.nix         | 4 ++--
 bert/services/http/swiftgang.net.nix           | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bert/services/http/files.chandlerswift.com.nix b/bert/services/http/files.chandlerswift.com.nix
index aad3102..74c5e0c 100644
--- a/bert/services/http/files.chandlerswift.com.nix
+++ b/bert/services/http/files.chandlerswift.com.nix
@@ -3,10 +3,10 @@
   services.caddy.virtualHosts."files.chandlerswift.com".extraConfig = ''
     encode zstd gzip
     file_server
-    root * /srv/files.chandlerswift.com
+    root * /srv/www/files.chandlerswift.com
   '';
   systemd.tmpfiles.settings."10-files-chandlerswift-com" = {
-    "/srv/files.chandlerswift.com" = {
+    "/srv/www/files.chandlerswift.com" = {
       d = {};
     };
   };
diff --git a/bert/services/http/home.chandlerswift.com.nix b/bert/services/http/home.chandlerswift.com.nix
index 404673d..eef8812 100644
--- a/bert/services/http/home.chandlerswift.com.nix
+++ b/bert/services/http/home.chandlerswift.com.nix
@@ -3,12 +3,12 @@
   services.caddy.virtualHosts."home.chandlerswift.com".extraConfig = ''
     encode zstd gzip
     file_server
-    root * /srv/home.chandlerswift.com
+    root * /srv/www/home.chandlerswift.com
     reverse_proxy /grafana/* localhost:3000
     # hide .git # ???
   '';
   systemd.tmpfiles.settings."10-home-chandlerswift-com" = {
-    "/srv/home.chandlerswift.com" = {
+    "/srv/www/home.chandlerswift.com" = {
       d = {};
     };
   };
diff --git a/bert/services/http/maps.chandlerswift.com.nix b/bert/services/http/maps.chandlerswift.com.nix
index 74251bb..fb21cb8 100644
--- a/bert/services/http/maps.chandlerswift.com.nix
+++ b/bert/services/http/maps.chandlerswift.com.nix
@@ -3,11 +3,11 @@
   services.caddy.virtualHosts."maps.chandlerswift.com".extraConfig = ''
     encode zstd gzip
     file_server
-    root * /srv/maps.chandlerswift.com
+    root * /srv/www/maps.chandlerswift.com
     # hide .git # ???
   '';
   systemd.tmpfiles.settings."10-maps-chandlerswift-com" = {
-    "/srv/maps.chandlerswift.com" = {
+    "/srv/www/maps.chandlerswift.com" = {
       d = {};
     };
   };
diff --git a/bert/services/http/stjohnscccc.org.nix b/bert/services/http/stjohnscccc.org.nix
index a9309e0..7cbc99a 100644
--- a/bert/services/http/stjohnscccc.org.nix
+++ b/bert/services/http/stjohnscccc.org.nix
@@ -2,7 +2,7 @@
 let
   app = "stjohnscccc";
   domain = "${app}.chandlerswift.com"; # TODO
-  dataDir = "/srv/http/${domain}";
+  dataDir = "/srv/www/http/${domain}";
 in {
   services.phpfpm.pools.${app} = {
     user = app;
@@ -35,7 +35,7 @@ in {
   };
   users.groups.${app} = {};
   systemd.tmpfiles.settings."10-stjohnscccc.org" = {
-    "/srv/stjohnscccc.org" = {
+    "/srv/www/stjohnscccc.org" = {
       d = {};
     };
   };
diff --git a/bert/services/http/swiftgang.net.nix b/bert/services/http/swiftgang.net.nix
index d2d0756..82bee79 100644
--- a/bert/services/http/swiftgang.net.nix
+++ b/bert/services/http/swiftgang.net.nix
@@ -3,10 +3,10 @@
   services.caddy.virtualHosts."swiftgang.net".extraConfig = ''
     encode zstd gzip
     file_server
-    root * /srv/swiftgang.net
+    root * /srv/www/swiftgang.net
   '';
   systemd.tmpfiles.settings."10-swiftgang-net" = {
-    "/srv/swiftgang.net" = {
+    "/srv/www/swiftgang.net" = {
       d = {};
     };
   };