From 931afac7e067c6d9d1dd5bfd4ff4f4ea4567ea38 Mon Sep 17 00:00:00 2001
From: lilly <li@lly.sh>
Date: Tue, 9 Jun 2026 21:27:13 +0200
Subject: [PATCH 1/2] add ueberwachungsfrei-kundgebung site

---
 .../chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf   | 1 +
 resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf
index 304072b..a7ae7f0 100644
--- a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf
+++ b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf
@@ -87,6 +87,7 @@ map $host $upstream_acme_challenge_host {
     staging.docs.c3voc.de public-web-static.hosts.hamburg.ccc.de:31820;
     infra-docs.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820;
     staging.infra-docs.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820;
+    ueberwachungsfrei-kundgebung.hamburg.ccc.de public-web-static.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 5e89aa9..3f61267 100644
--- a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf
+++ b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf
@@ -110,6 +110,7 @@ stream {
         staging.docs.c3voc.de public-web-static.hosts.hamburg.ccc.de:8443;
         infra-docs.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443;
         staging.infra-docs.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443;
+        ueberwachungsfrei-kundgebung.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443;
     }
 
     server {

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