From fb77c92330ed312e10d8fe5f1bfcf2992099ebb5 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sun, 8 Jan 2023 23:10:22 +0100
Subject: [PATCH] c3d2-web: redirect rc3 vhosts to datenspuren.de

---
 hosts/c3d2-web/default.nix            | 13 +++++++++++++
 hosts/public-access-proxy/default.nix |  4 +---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/hosts/c3d2-web/default.nix b/hosts/c3d2-web/default.nix
index f433ab33..5a691de3 100644
--- a/hosts/c3d2-web/default.nix
+++ b/hosts/c3d2-web/default.nix
@@ -91,6 +91,19 @@ in
         '';
       };
 
+      # temporary redirects for outdated domains
+      "dezentrale-jahresendveranstaltungen.fyi" = {
+        serverAliases = [
+          "rc3.c3d2.de"
+          "www.dezentrale-jahresendveranstaltungen.fyi"
+        ];
+        enableACME = true;
+        forceSSL = true;
+        locations."/".extraConfig = ''
+          return 301 https://datenspuren.de;
+        '';
+      };
+
       # hooks, logs
       "c3d2-web.flpk.zentralwerk.org" = {
         enableACME = true;
diff --git a/hosts/public-access-proxy/default.nix b/hosts/public-access-proxy/default.nix
index fc43d990..b32a2d0d 100644
--- a/hosts/public-access-proxy/default.nix
+++ b/hosts/public-access-proxy/default.nix
@@ -60,6 +60,7 @@
         "openpgpkey.c3d2.de"
         "netzbiotop.org" "www.netzbiotop.org"
         "autotopia.c3d2.de"
+        "rc3.c3d2.de" "dezentrale-jahresendveranstaltungen.fyi" "www.dezentrale-jahresendveranstaltungen.fyi"
       ];
       proxyTo.host = zentralwerk.lib.config.site.net.flpk.hosts4.c3d2-web;
     } {
@@ -123,9 +124,6 @@
     } {
       hostNames = [ "ticker.c3d2.de" ];
       proxyTo.host = hostRegistry.ticker.ip4;
-    } {
-      hostNames = [ "rc3.c3d2.de" "dezentrale-jahresendveranstaltungen.fyi" "www.dezentrale-jahresendveranstaltungen.fyi" ];
-      proxyTo.host = hostRegistry.rc3ticker.ip4;
     } {
       hostNames = [ "wiki.c3d2.de" ];
       proxyTo.host = hostRegistry.mediawiki.ip4;