From 200e8019edd9e4504282f21d8df367cbeb0f316b Mon Sep 17 00:00:00 2001
From: June <june@jsts.xyz>
Date: Tue, 27 Jan 2026 15:47:52 +0100
Subject: [PATCH 1/2] public-reverse-proxy: add config for local/lokal.ccc.de

local/lokal.ccc.de points to cpu.ccc.de.
---
 .../chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf  | 2 ++
 resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf
index feacfa7..73af834 100644
--- a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf
+++ b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf
@@ -82,6 +82,8 @@ map $host $upstream_acme_challenge_host {
     spaceapi.ccc.de spaceapiccc.hosts.hamburg.ccc.de:31820;
     cpuccc.hamburg.ccc.de 172.31.17.151:31820;
     cpu.ccc.de 172.31.17.151:31820;
+    lokal.ccc.de 172.31.17.151:31820;
+    local.ccc.de 172.31.17.151:31820;
     acmedns.hamburg.ccc.de acmedns.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 fc62a89..5e1fec8 100644
--- a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf
+++ b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf
@@ -100,6 +100,8 @@ stream {
         spaceapi.ccc.de spaceapiccc.hosts.hamburg.ccc.de:8443;
         cpuccc.hamburg.ccc.de 172.31.17.151:8443;
         cpu.ccc.de 172.31.17.151:8443;
+        lokal.ccc.de 172.31.17.151:8443;
+        local.ccc.de 172.31.17.151:8443;
         acmedns.hamburg.ccc.de acmedns.hosts.hamburg.ccc.de:8443;
     }
 

From e02a2ec2afebc12e7d149da53d3ee4e588acc6f1 Mon Sep 17 00:00:00 2001
From: Renovate <no-reply@git.hamburg.ccc.de>
Date: Tue, 27 Jan 2026 15:00:55 +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 }}"