From a71ce4b5fd1a5217f64ae1a31f62da9cc610da7f Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Mon, 21 Apr 2025 12:58:45 +0100
Subject: [PATCH] Move websites into vhosts

So it doesn't clash with Forgejo which is currently in /var/www/forgejo.
---
 hosts/nixedo/modules/nginx/sites.nix          | 26 +++++++++----------
 .../modules/nginx/www.oliverdavies.uk.nix     |  4 +--
 pkgs/backup-websites.nix                      |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/hosts/nixedo/modules/nginx/sites.nix b/hosts/nixedo/modules/nginx/sites.nix
index 9b9a0df8..30c344c2 100644
--- a/hosts/nixedo/modules/nginx/sites.nix
+++ b/hosts/nixedo/modules/nginx/sites.nix
@@ -1,13 +1,13 @@
 [
   {
     url = "bootstrap-with-tailwind.oliverdavies.uk";
-    root = "/var/www/bootstrap-with-tailwind";
+    root = "/var/www/vhosts/bootstrap-with-tailwind";
     port = 8081;
   }
 
   {
     port = 8084;
-    root = "/var/www/eric/public";
+    root = "/var/www/vhosts/eric/public";
     url = "eric.oliverdavies.uk";
 
     extraConfig = ''
@@ -17,13 +17,13 @@
 
   {
     port = 8083;
-    root = "/var/www/florida-drupalcamp-tailwind-css";
+    root = "/var/www/vhosts/florida-drupalcamp-tailwind-css";
     url = "florida-drupalcamp-tailwind-css.oliverdavies.uk";
   }
 
   {
     port = 8094;
-    root = "/var/www/luke";
+    root = "/var/www/vhosts/luke";
     url = "luke.oliverdavies.uk";
 
     extraConfig = ''
@@ -33,55 +33,55 @@
 
   {
     port = 8085;
-    root = "/var/www/phpsw-sculpin-demo";
+    root = "/var/www/vhosts/phpsw-sculpin-demo";
     url = "phpsw-sculpin-demo.oliverdavies.uk";
   }
 
   {
     port = 8086;
-    root = "/var/www/rebuilding-acquia";
+    root = "/var/www/vhosts/rebuilding-acquia";
     url = "rebuilding-acquia.oliverdavies.uk";
   }
 
   {
     port = 8087;
-    root = "/var/www/rebuilding-bartik";
+    root = "/var/www/vhosts/rebuilding-bartik";
     url = "rebuilding-bartik.oliverdavies.uk";
   }
 
   {
     port = 8088;
-    root = "/var/www/rebuilding-bristol-js";
+    root = "/var/www/vhosts/rebuilding-bristol-js";
     url = "rebuilding-bristol-js.oliverdavies.uk";
   }
 
   {
     port = 8089;
-    root = "/var/www/rebuilding-symfony";
+    root = "/var/www/vhosts/rebuilding-symfony";
     url = "rebuilding-symfony.oliverdavies.uk";
   }
 
   {
     port = 8090;
-    root = "/var/www/tailwindcss-demo";
+    root = "/var/www/vhosts/tailwindcss-demo";
     url = "tailwindcss-demo.oliverdavies.uk";
   }
 
   {
     port = 8091;
-    root = "/var/www/wp-tailwind";
+    root = "/var/www/vhosts/wp-tailwind";
     url = "wp-tailwind.oliverdavies.uk";
   }
 
   {
     port = 8092;
-    root = "/var/www/zet";
+    root = "/var/www/vhosts/zet";
     url = "zet.oliverdavies.uk";
   }
 
   {
     port = 8093;
-    root = "/var/www/talking-drupal-tailwindcss";
+    root = "/var/www/vhosts/talking-drupal-tailwindcss";
     url = "talking-drupal-tailwindcss.oliverdavies.uk";
   }
 ]
diff --git a/hosts/nixedo/modules/nginx/www.oliverdavies.uk.nix b/hosts/nixedo/modules/nginx/www.oliverdavies.uk.nix
index 28173837..a523ca4f 100644
--- a/hosts/nixedo/modules/nginx/www.oliverdavies.uk.nix
+++ b/hosts/nixedo/modules/nginx/www.oliverdavies.uk.nix
@@ -19,7 +19,7 @@ let
       name = "/${path}";
 
       value = {
-        root = "/var/www/website-tome";
+        root = "/var/www/vhosts/website-tome";
         tryFiles = "$uri $uri.html $uri/index.html =404";
       };
     }) tomePaths
@@ -29,7 +29,7 @@ in
   services = {
     nginx.virtualHosts = {
       "www.oliverdavies.uk" = {
-        root = "/var/www/website-sculpin";
+        root = "/var/www/vhosts/website-sculpin";
 
         listen = [
           {
diff --git a/pkgs/backup-websites.nix b/pkgs/backup-websites.nix
index 663cb904..7a64db73 100644
--- a/pkgs/backup-websites.nix
+++ b/pkgs/backup-websites.nix
@@ -8,6 +8,6 @@ pkgs.writeShellApplication {
 
     mkdir -p "''${backup_path}"
 
-    ${lib.getExe pkgs.rsync} -avzP nixedo:/var/www/ "''${backup_path}" --delete-after
+    ${lib.getExe pkgs.rsync} -avzP nixedo:/var/www/vhosts/ "''${backup_path}" --delete-after
   '';
 }