From cf98c9df3098f5246c59ab939628d660c0cfcc8b Mon Sep 17 00:00:00 2001
From: lilly <li@lly.sh>
Date: Tue, 30 Jun 2026 21:14:21 +0200
Subject: [PATCH 1/2] configure dooris to write ssh public keys into file

---
 resources/z9/dooris/docker_compose/compose.yaml.j2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/z9/dooris/docker_compose/compose.yaml.j2 b/resources/z9/dooris/docker_compose/compose.yaml.j2
index d16c8ad..e81b233 100644
--- a/resources/z9/dooris/docker_compose/compose.yaml.j2
+++ b/resources/z9/dooris/docker_compose/compose.yaml.j2
@@ -10,5 +10,8 @@ services:
       DOORIS_BASE_URL: https://dooris.ccchh.net
       DOORIS_CCUJACK_USER: "dooris"
       DOORIS_CCUJACK_PASSWORD: "{{ secret__dooris_ccujack_password }}"
+      DOORIS_AUTHORIZED_KEYS_FILE: "/srv/state/dooris_authorized_keys"
     network_mode: host
     restart: unless-stopped
+    volumes:
+      - "./state:/srv/state/:rw"

From 9c45515d1d4a90c1a9a198e844d136789e49db96 Mon Sep 17 00:00:00 2001
From: Renovate <no-reply@git.hamburg.ccc.de>
Date: Tue, 30 Jun 2026 19:16:06 +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 }}"