From e5740af04b222b60d1e9a3ce65ed921b9d8f7283 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.be>
Date: Sun, 10 Nov 2024 18:32:44 +0100
Subject: [PATCH] Move personal website to marabethia

---
 machines/lasting-integrity/default.nix | 24 -----------------------
 machines/marabethia/default.nix        | 27 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/machines/lasting-integrity/default.nix b/machines/lasting-integrity/default.nix
index 576c1e52..8ea8b01c 100644
--- a/machines/lasting-integrity/default.nix
+++ b/machines/lasting-integrity/default.nix
@@ -77,11 +77,6 @@
       mastodon.enable = true;
       matrix.enable = true;
       nginx.hosts = [
-        {
-          fqdn = "vanpetegem.be";
-          options.locations."/".return = "307 https://www.vanpetegem.be$request_uri";
-        }
-        { fqdn = "www.vanpetegem.be"; }
         {
           fqdn = "vanpetegem.me";
           options = {
@@ -113,25 +108,6 @@
           };
         }
         { fqdn = "www.vanpetegem.me"; }
-        {
-          fqdn = "cvpetegem.be";
-          options.locations."/".return = "307 https://www.chvp.be$request_uri";
-        }
-        {
-          fqdn = "www.cvpetegem.be";
-          options.locations."/".return = "307 https://www.chvp.be$request_uri";
-        }
-        {
-          fqdn = "chvp.be";
-          options.locations = {
-            "/".return = "307 https://www.chvp.be$request_uri";
-            "/phd/register".return = "307 https://nextcloud.vanpetegem.me/apps/forms/s/PrWYKWkwgwA7naE3ryRwmfcd";
-          };
-        }
-        {
-          fqdn = "www.chvp.be";
-          options.root = pkgs."www.chvp.be";
-        }
       ];
       nextcloud.enable = true;
     };
diff --git a/machines/marabethia/default.nix b/machines/marabethia/default.nix
index 6d9f6d07..33670935 100644
--- a/machines/marabethia/default.nix
+++ b/machines/marabethia/default.nix
@@ -37,5 +37,32 @@
       particles.server = true;
       tetris.server = true;
     };
+    services = {
+      nginx.hosts = [
+        {
+          fqdn = "cvpetegem.be";
+          options.locations."/".return = "307 https://www.chvp.be$request_uri";
+        }
+        {
+          fqdn = "www.cvpetegem.be";
+          options.locations."/".return = "307 https://www.chvp.be$request_uri";
+        }
+        {
+          fqdn = "chvp.be";
+          options.locations = {
+            "/".return = "307 https://www.chvp.be$request_uri";
+          };
+        }
+        {
+          fqdn = "www.chvp.be";
+          options.root = pkgs."www.chvp.be";
+        }
+        {
+          fqdn = "vanpetegem.be";
+          options.locations."/".return = "307 https://www.vanpetegem.be$request_uri";
+        }
+        { fqdn = "www.vanpetegem.be"; }
+      ];
+    };
   };
 }