From 6d922b7c8b295a5c85f119ccfb46cbc7be151267 Mon Sep 17 00:00:00 2001
From: lilly <li@lly.sh>
Date: Wed, 10 Jun 2026 13:11:55 +0200
Subject: [PATCH 1/2] dns: also notify erfadns.ber.ccc.de for catalog zone
 changes

---
 inventories/chaosknoten/host_vars/auth-dns.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inventories/chaosknoten/host_vars/auth-dns.yaml b/inventories/chaosknoten/host_vars/auth-dns.yaml
index 01fadbc..9b94479 100644
--- a/inventories/chaosknoten/host_vars/auth-dns.yaml
+++ b/inventories/chaosknoten/host_vars/auth-dns.yaml
@@ -12,7 +12,7 @@ knot__remotes:
 
 knot__catalog_zones:
   - domain: "hamburg.ccc.de.catalog."
-    notify_targets: [ "ns.vie.ccc.de" ]
+    notify_targets: [ "erfadns.ber.ccc.de", "ns.vie.ccc.de" ]
 
 knot__zones:
   - domain: "hh.ccc.de."

From 1933d576639c6bca5a37276c5a973ba6622bfe99 Mon Sep 17 00:00:00 2001
From: Renovate <no-reply@git.hamburg.ccc.de>
Date: Wed, 10 Jun 2026 11:16:03 +0000
Subject: [PATCH 2/2] Update docker.io/library/postgres Docker tag to v18

---
 inventories/chaosknoten/host_vars/cloud.yaml                 | 2 +-
 resources/chaosknoten/lists/docker_compose/compose.yaml.j2   | 2 +-
 resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/inventories/chaosknoten/host_vars/cloud.yaml b/inventories/chaosknoten/host_vars/cloud.yaml
index 19aca7b..7d0ee89 100644
--- a/inventories/chaosknoten/host_vars/cloud.yaml
+++ b/inventories/chaosknoten/host_vars/cloud.yaml
@@ -1,7 +1,7 @@
 # renovate: datasource=docker depName=git.hamburg.ccc.de/ccchh/oci-images/nextcloud
 nextcloud__version: 33
 # renovate: datasource=docker depName=docker.io/library/postgres
-nextcloud__postgres_version: 15.18
+nextcloud__postgres_version: 18.4
 nextcloud__fqdn: cloud.hamburg.ccc.de
 nextcloud__data_dir: /data/nextcloud
 nextcloud__extra_configuration: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/cloud/nextcloud/extra_configuration.config.php.j2') }}"
diff --git a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2
index db605b5..58d1ed5 100644
--- a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2
@@ -62,7 +62,7 @@ services:
       - POSTGRES_DB=mailmandb
       - POSTGRES_USER=mailman
       - "POSTGRES_PASSWORD={{ secret__lists__postgres_password }}"
-    image: docker.io/library/postgres:12-alpine
+    image: docker.io/library/postgres:18-alpine
     volumes:
       - /opt/mailman/database:/var/lib/postgresql/data
     networks:
diff --git a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2
index 0bbfcb8..091bd44 100644
--- a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2
@@ -3,7 +3,7 @@
 
 services:
   database:
-    image: docker.io/library/postgres:15-alpine
+    image: docker.io/library/postgres:18-alpine
     environment:
       - "POSTGRES_USER=pretalx"
       - "POSTGRES_PASSWORD={{ secret__pretalx_db_password }}"