From 99efc60fcee02906038457106446cfcdae8e8bd3 Mon Sep 17 00:00:00 2001
From: lilly <li@lly.sh>
Date: Thu, 26 Feb 2026 18:01:34 +0100
Subject: [PATCH] configure diday.org on public-static-web

---
 .../virtualHosts/default.nix                  |  2 +-
 .../{did.hamburg.ccc.de.nix => diday.org.nix} | 24 +++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)
 rename config/hosts/public-web-static/virtualHosts/{did.hamburg.ccc.de.nix => diday.org.nix} (87%)

diff --git a/config/hosts/public-web-static/virtualHosts/default.nix b/config/hosts/public-web-static/virtualHosts/default.nix
index 35da7f5..1ac82c3 100644
--- a/config/hosts/public-web-static/virtualHosts/default.nix
+++ b/config/hosts/public-web-static/virtualHosts/default.nix
@@ -19,7 +19,7 @@
     ./staging.hamburg.ccc.de.nix
     ./www.hamburg.ccc.de.nix
     ./staging.did.hamburg.ccc.de.nix
-    ./did.hamburg.ccc.de.nix
+    ./diday.org.nix
     ./historic-easterhegg
   ];
 }
diff --git a/config/hosts/public-web-static/virtualHosts/did.hamburg.ccc.de.nix b/config/hosts/public-web-static/virtualHosts/diday.org.nix
similarity index 87%
rename from config/hosts/public-web-static/virtualHosts/did.hamburg.ccc.de.nix
rename to config/hosts/public-web-static/virtualHosts/diday.org.nix
index 6a89a22..9c908ac 100644
--- a/config/hosts/public-web-static/virtualHosts/did.hamburg.ccc.de.nix
+++ b/config/hosts/public-web-static/virtualHosts/diday.org.nix
@@ -1,12 +1,14 @@
 { ... }:
 
 let
-  domain = "did.hamburg.ccc.de";
+  domain = "diday.org";
   dataDir = "/var/www/${domain}";
   deployUser = "diday-website-deploy";
 in
 {
-  # security.acme.certs."${domain}".extraDomainNames = [];
+  security.acme.certs."${domain}".extraDomainNames = [
+    "did.hamburg.ccc.de"
+  ];
 
   services.nginx.virtualHosts = {
     "acme-${domain}" = {
@@ -21,6 +23,24 @@ in
       ];
     };
 
+    "did.hamburg.ccc.de" = {
+      forceSSL = true;
+      useACMEHost = "${domain}";
+
+      listen = [
+        {
+          addr = "0.0.0.0";
+          port = 8443;
+          ssl = true;
+          proxyProtocol = true;
+        }
+      ];
+
+      extraConfig = ''
+        return 301 https://diday.org;
+      '';
+    };
+
     "${domain}" = {
       forceSSL = true;
       useACMEHost = "${domain}";