From 931afac7e067c6d9d1dd5bfd4ff4f4ea4567ea38 Mon Sep 17 00:00:00 2001
From: lilly <li@lly.sh>
Date: Tue, 9 Jun 2026 21:27:13 +0200
Subject: [PATCH 1/2] add ueberwachungsfrei-kundgebung site

---
 .../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 304072b..a7ae7f0 100644
--- a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf
+++ b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf
@@ -87,6 +87,7 @@ 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;
     default "";
 }
 
diff --git a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf
index 5e89aa9..3f61267 100644
--- a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf
+++ b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf
@@ -110,6 +110,7 @@ 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;
     }
 
     server {

From 28c019928874fb762c2f8c7d4041bd8b88c48cd1 Mon Sep 17 00:00:00 2001
From: Renovate <no-reply@git.hamburg.ccc.de>
Date: Tue, 9 Jun 2026 19:46:04 +0000
Subject: [PATCH 2/2] Update docker.io/library/mariadb Docker tag to v12

---
 resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2 b/resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2
index c2108d8..f359f47 100644
--- a/resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2
@@ -3,7 +3,7 @@
 
 services:
   database:
-    image: docker.io/library/mariadb:11
+    image: docker.io/library/mariadb:12
     environment:
       - "MARIADB_DATABASE=wordpress"
       - "MARIADB_ROOT_PASSWORD={{ secret__mariadb_root_password }}"