From 9c2fe5ea9bc5759c61158a15d0caa6e3b479ebce Mon Sep 17 00:00:00 2001 From: June Date: Wed, 28 Jan 2026 15:32:29 +0100 Subject: [PATCH 1/2] public-reverse-proxy(host): remove cpuccc.hamburg.ccc.de alias --- .../chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf | 1 - resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf | 1 - 2 files changed, 2 deletions(-) diff --git a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf index d24fa66..c5ef0ea 100644 --- a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf +++ b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf @@ -79,7 +79,6 @@ map $host $upstream_acme_challenge_host { staging.cryptoparty-hamburg.de 172.31.17.151:31820; staging.cryptoparty.hamburg.ccc.de 172.31.17.151:31820; 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; diff --git a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf index 23e7240..a8b27fc 100644 --- a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf +++ b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf @@ -97,7 +97,6 @@ stream { staging.cryptoparty-hamburg.de 172.31.17.151:8443; staging.cryptoparty.hamburg.ccc.de 172.31.17.151:8443; 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; From e5d88ed8f8a01b90baf21eb8f490e5e513bee581 Mon Sep 17 00:00:00 2001 From: Renovate Date: Wed, 28 Jan 2026 14:45:56 +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 }}"