From 75b7e8032133b4f791c73bc0398eff151d916226 Mon Sep 17 00:00:00 2001 From: lilly Date: Thu, 11 Jun 2026 14:40:09 +0200 Subject: [PATCH 1/2] migrate uberwachungsfrei kundgebung to own domain --- resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone | 1 - .../public-reverse-proxy/nginx/acme_challenge.conf | 4 +++- resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone b/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone index b911d6c..33f8a31 100644 --- a/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone +++ b/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone @@ -289,7 +289,6 @@ cpuccc IN CNAME public-reverse-proxy did IN CNAME public-reverse-proxy infra-docs IN CNAME public-reverse-proxy staging.infra-docs IN CNAME public-reverse-proxy -ueberwachungsfrei-kundgebung IN CNAME public-reverse-proxy auth.acmedns IN NS acmedns.hosts.hamburg.ccc.de. diff --git a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf index a7ae7f0..6e309a2 100644 --- a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf +++ b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf @@ -87,7 +87,9 @@ map $host $upstream_acme_challenge_host { staging.docs.c3voc.de public-web-static.hosts.hamburg.ccc.de:31820; infra-docs.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; staging.infra-docs.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; - ueberwachungsfrei-kundgebung.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + 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; default ""; } diff --git a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf index 3f61267..5c57f0d 100644 --- a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf +++ b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf @@ -110,7 +110,9 @@ stream { staging.docs.c3voc.de public-web-static.hosts.hamburg.ccc.de:8443; infra-docs.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; staging.infra-docs.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; - ueberwachungsfrei-kundgebung.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + 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; } server { From f541973b0f529ca63c78ada926a27b0fae2e3d7c Mon Sep 17 00:00:00 2001 From: Renovate Date: Thu, 11 Jun 2026 12:46:08 +0000 Subject: [PATCH 2/2] Update GitHub Artifact Actions to v7 --- .forgejo/workflows/deploy-docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy-docs.yaml b/.forgejo/workflows/deploy-docs.yaml index 537d983..8ece046 100644 --- a/.forgejo/workflows/deploy-docs.yaml +++ b/.forgejo/workflows/deploy-docs.yaml @@ -67,7 +67,7 @@ jobs: run: | rsync -v -r --delete -e "ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts'" site/ infra-docs-deploy@public-web-static.hosts.hamburg.ccc.de:/var/www/infra-docs.hamburg.ccc.de/ - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v7 if: github.event_name == 'pull_request' with: name: docs-build