From 547210d31f4529a06a16cc449420e59570acd485 Mon Sep 17 00:00:00 2001 From: jtbx Date: Mon, 21 Sep 2026 19:44:51 +0200 Subject: [PATCH 1/3] auth-dns(host): Remove deleted www2 and www3 VMs --- resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone b/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone index f3512af1..05e5e030 100644 --- a/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone +++ b/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone @@ -510,8 +510,6 @@ pretalx.hosts IN AAAA 2a00:14b0:42:102::10 ntfy.hosts IN AAAA 2a00:14b0:42:102::11 spaceapiccc.hosts IN AAAA 2a00:14b0:42:102::12 acmedns.hosts IN AAAA 2a00:14b0:42:102::13 -www2.hosts IN AAAA 2a00:14b0:42:102::14 -www3.hosts IN AAAA 2a00:14b0:42:102::15 diday-staging-runner.hosts IN AAAA 2a00:14b0:42:102::16 public-web-static.hosts IN AAAA 2a00:14b0:42:102::17 forgejo-actions-runner.hosts IN AAAA 2a00:14b0:42:102::18 -- 2.54.0 From a649455d92409363753d86ad0205ca412848c6bc Mon Sep 17 00:00:00 2001 From: jtbx Date: Mon, 21 Sep 2026 19:48:56 +0200 Subject: [PATCH 2/3] auth-dns(host): Move bildungsurlaub.hamburg.ccc.de to public-web-static --- resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone b/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone index 05e5e030..5cdb7a8f 100644 --- a/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone +++ b/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone @@ -228,10 +228,7 @@ rproxy-intern IN A 172.31.17.180 IN AAAA 2a00:14b0:f000:23::80 IN MX 10 cow.hamburg.ccc.de. -bildungsurlaub IN CNAME rproxy -doku IN CNAME rproxy -test IN CNAME rproxy -www.test IN CNAME rproxy +bildungsurlaub IN CNAME public-reverse-proxy eh2003 IN CNAME public-reverse-proxy www.eh2003 IN CNAME public-reverse-proxy easterhegg2003 IN CNAME public-reverse-proxy -- 2.54.0 From fbddd28c71105357683f74f55e15b94d6489ddc9 Mon Sep 17 00:00:00 2001 From: jtbx Date: Mon, 21 Sep 2026 19:51:18 +0200 Subject: [PATCH 3/3] public-reverse-proxy(host): Add bildungsurlaub.hamburg.ccc.de --- .../chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf | 1 + resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf index 2513b7c8..be0a2665 100644 --- a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf +++ b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf @@ -92,6 +92,7 @@ map $host $upstream_acme_challenge_host { ueberwachungsfrei.eu public-web-static.hosts.hamburg.ccc.de:31820; überwachungsfrei.eu public-web-static.hosts.hamburg.ccc.de:31820; xn--berwachungsfrei-yvb.eu public-web-static.hosts.hamburg.ccc.de:31820; + bildungsurlaub.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; default ""; } diff --git a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf index 01d0b5d6..c7be7563 100644 --- a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf +++ b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf @@ -115,6 +115,7 @@ stream { ueberwachungsfrei.eu public-web-static.hosts.hamburg.ccc.de:8443; überwachungsfrei.eu public-web-static.hosts.hamburg.ccc.de:8443; xn--berwachungsfrei-yvb.eu public-web-static.hosts.hamburg.ccc.de:8443; + bildungsurlaub.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; } server { -- 2.54.0