From 428b5c70bc3d02be51283a69105cf36ce44139ff Mon Sep 17 00:00:00 2001
From: June <june@jsts.xyz>
Date: Tue, 13 Jan 2026 14:19:57 +0100
Subject: [PATCH 1/3] pretalx(host): roll back to pretalx v2025.1.0 for celery
 as well

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

diff --git a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2
index f61d6f7..091d113 100644
--- a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2
@@ -78,7 +78,7 @@ services:
       - pretalx_net
 
   celery:
-    image: docker.io/pretalx/standalone:v2025.2.2
+    image: docker.io/pretalx/standalone:v2025.1.0
     command:
       - taskworker
     restart: unless-stopped

From 51bbdd42a2504f0b3045349b0b08e3bb75b55fce Mon Sep 17 00:00:00 2001
From: June <june@jsts.xyz>
Date: Tue, 13 Jan 2026 16:55:22 +0100
Subject: [PATCH 2/3] dooris(host): make certbot work

---
 inventories/z9/host_vars/dooris.yaml        |  4 +++-
 resources/z9/dooris/nginx/http_handler.conf | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 resources/z9/dooris/nginx/http_handler.conf

diff --git a/inventories/z9/host_vars/dooris.yaml b/inventories/z9/host_vars/dooris.yaml
index 5813e3a..8ae5287 100644
--- a/inventories/z9/host_vars/dooris.yaml
+++ b/inventories/z9/host_vars/dooris.yaml
@@ -7,9 +7,11 @@ certbot__certificate_domains:
   - "dooris.ccchh.net"
 certbot__new_cert_commands:
   - "systemctl reload nginx.service"
-certbot__http_01_port: 80
 
 nginx__version_spec: ""
+nginx__deploy_redirect_conf: false
 nginx__configurations:
   - name: dooris.ccchh.net
     content: "{{ lookup('ansible.builtin.file', 'resources/z9/dooris/nginx/dooris.ccchh.net.conf') }}"
+  - name: http_handler
+    content: "{{ lookup('ansible.builtin.file', 'resources/z9/dooris/nginx/http_handler.conf') }}"
diff --git a/resources/z9/dooris/nginx/http_handler.conf b/resources/z9/dooris/nginx/http_handler.conf
new file mode 100644
index 0000000..8572664
--- /dev/null
+++ b/resources/z9/dooris/nginx/http_handler.conf
@@ -0,0 +1,12 @@
+server {
+    listen 80 default_server;
+    listen [::]:80 default_server;
+
+    location / {
+        return 301 https://$host$request_uri;
+    }
+
+    location /.well-known/acme-challenge/ {
+        proxy_pass http://127.0.0.1:31820/.well-known/acme-challenge/;
+    }
+}

From 72e2bd1b598c59716841608bad869539e288ed92 Mon Sep 17 00:00:00 2001
From: Renovate <no-reply@git.hamburg.ccc.de>
Date: Tue, 13 Jan 2026 16:00:44 +0000
Subject: [PATCH 3/3] 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 }}"