From 931afac7e067c6d9d1dd5bfd4ff4f4ea4567ea38 Mon Sep 17 00:00:00 2001
From: lilly
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 e7abd1926a9782f5975ffa3c38b527ab29627fc4 Mon Sep 17 00:00:00 2001
From: Renovate
Date: Tue, 9 Jun 2026 19:45:56 +0000
Subject: [PATCH 2/2] Update all stable non-major dependencies
---
.forgejo/workflows/lint.yaml | 2 +-
inventories/chaosknoten/host_vars/netbox.yaml | 2 +-
.../chaosknoten/acmedns/docker_compose/compose.yaml.j2 | 2 +-
.../chaosknoten/grafana/docker_compose/compose.yaml.j2 | 10 +++++-----
.../keycloak/docker_compose/compose.yaml.j2 | 2 +-
.../chaosknoten/ntfy/docker_compose/compose.yaml.j2 | 2 +-
.../onlyoffice/docker_compose/compose.yaml.j2 | 2 +-
.../chaosknoten/pretalx/docker_compose/compose.yaml.j2 | 4 ++--
.../chaosknoten/sunders/docker_compose/compose.yaml.j2 | 2 +-
.../chaosknoten/tickets/docker_compose/compose.yaml.j2 | 2 +-
.../external/status/docker_compose/compose.yaml.j2 | 4 ++--
11 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/.forgejo/workflows/lint.yaml b/.forgejo/workflows/lint.yaml
index bdd53f5..600d044 100644
--- a/.forgejo/workflows/lint.yaml
+++ b/.forgejo/workflows/lint.yaml
@@ -24,7 +24,7 @@ jobs:
# work in our environmnet.
# Rather manually setup python (pip) before instead.
- name: Run ansible-lint
- uses: https://github.com/ansible/ansible-lint@v26.3.0
+ uses: https://github.com/ansible/ansible-lint@v26.4.0
with:
setup_python: "false"
requirements_file: "requirements.yml"
diff --git a/inventories/chaosknoten/host_vars/netbox.yaml b/inventories/chaosknoten/host_vars/netbox.yaml
index f28d193..5c5861e 100644
--- a/inventories/chaosknoten/host_vars/netbox.yaml
+++ b/inventories/chaosknoten/host_vars/netbox.yaml
@@ -1,5 +1,5 @@
# renovate: datasource=github-releases depName=netbox packageName=netbox-community/netbox
-netbox__version: "v4.5.5"
+netbox__version: "v4.6.2"
netbox__config: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/netbox/netbox/configuration.py.j2') }}"
netbox__custom_pipeline_oidc_group_and_role_mapping: true
diff --git a/resources/chaosknoten/acmedns/docker_compose/compose.yaml.j2 b/resources/chaosknoten/acmedns/docker_compose/compose.yaml.j2
index 3fcd8c6..2553f4d 100644
--- a/resources/chaosknoten/acmedns/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/acmedns/docker_compose/compose.yaml.j2
@@ -2,7 +2,7 @@
services:
oauth2-proxy:
container_name: oauth2-proxy
- image: quay.io/oauth2-proxy/oauth2-proxy:v7.15.1
+ image: quay.io/oauth2-proxy/oauth2-proxy:v7.15.3
command: --config /oauth2-proxy.cfg
hostname: oauth2-proxy
volumes:
diff --git a/resources/chaosknoten/grafana/docker_compose/compose.yaml.j2 b/resources/chaosknoten/grafana/docker_compose/compose.yaml.j2
index 1f6c42f..c15bbde 100644
--- a/resources/chaosknoten/grafana/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/grafana/docker_compose/compose.yaml.j2
@@ -2,7 +2,7 @@
services:
prometheus:
- image: docker.io/prom/prometheus:v3.10.0
+ image: docker.io/prom/prometheus:v3.12.0
container_name: prometheus
command:
- '--config.file=/etc/prometheus/prometheus.yml'
@@ -19,7 +19,7 @@ services:
- prom_data:/prometheus
alertmanager:
- image: docker.io/prom/alertmanager:v0.31.1
+ image: docker.io/prom/alertmanager:v0.32.2
container_name: alertmanager
command:
- '--config.file=/etc/alertmanager/alertmanager.yaml'
@@ -32,7 +32,7 @@ services:
- alertmanager_data:/alertmanager
grafana:
- image: docker.io/grafana/grafana:13.0.1
+ image: docker.io/grafana/grafana:13.0.2
container_name: grafana
ports:
- 3000:3000
@@ -46,7 +46,7 @@ services:
- graf_data:/var/lib/grafana
pve-exporter:
- image: docker.io/prompve/prometheus-pve-exporter:3.8.2
+ image: docker.io/prompve/prometheus-pve-exporter:3.9.0
container_name: pve-exporter
ports:
- 9221:9221
@@ -59,7 +59,7 @@ services:
- /dev/null:/etc/prometheus/pve.yml
loki:
- image: docker.io/grafana/loki:3.7.1
+ image: docker.io/grafana/loki:3.7.2
container_name: loki
ports:
- 13100:3100
diff --git a/resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2 b/resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2
index 8db3526..75c94e0 100644
--- a/resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2
@@ -22,7 +22,7 @@
services:
keycloak:
- image: git.hamburg.ccc.de/ccchh/oci-images/keycloak:26.6.0
+ image: git.hamburg.ccc.de/ccchh/oci-images/keycloak:26.6.3
pull_policy: always
restart: unless-stopped
command: start --optimized
diff --git a/resources/chaosknoten/ntfy/docker_compose/compose.yaml.j2 b/resources/chaosknoten/ntfy/docker_compose/compose.yaml.j2
index af1b531..f65195c 100644
--- a/resources/chaosknoten/ntfy/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/ntfy/docker_compose/compose.yaml.j2
@@ -1,7 +1,7 @@
---
services:
ntfy:
- image: docker.io/binwiederhier/ntfy:v2.20.1
+ image: docker.io/binwiederhier/ntfy:v2.24.0
container_name: ntfy
command:
- serve
diff --git a/resources/chaosknoten/onlyoffice/docker_compose/compose.yaml.j2 b/resources/chaosknoten/onlyoffice/docker_compose/compose.yaml.j2
index 77f1395..58dddb2 100644
--- a/resources/chaosknoten/onlyoffice/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/onlyoffice/docker_compose/compose.yaml.j2
@@ -4,7 +4,7 @@
services:
onlyoffice:
- image: docker.io/onlyoffice/documentserver:9.3.1
+ image: docker.io/onlyoffice/documentserver:9.4.0
restart: unless-stopped
volumes:
- "./onlyoffice/DocumentServer/logs:/var/log/onlyoffice"
diff --git a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2
index 0bbfcb8..393dfa5 100644
--- a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2
@@ -15,7 +15,7 @@ services:
- pretalx_net
redis:
- image: docker.io/library/redis:8.6.2
+ image: docker.io/library/redis:8.8.0
restart: unless-stopped
volumes:
- redis:/data
@@ -23,7 +23,7 @@ services:
- pretalx_net
static:
- image: docker.io/library/nginx:1.29.7
+ image: docker.io/library/nginx:1.31.1
restart: unless-stopped
volumes:
- public:/usr/share/nginx/html
diff --git a/resources/chaosknoten/sunders/docker_compose/compose.yaml.j2 b/resources/chaosknoten/sunders/docker_compose/compose.yaml.j2
index bb4127f..8ee08ba 100644
--- a/resources/chaosknoten/sunders/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/sunders/docker_compose/compose.yaml.j2
@@ -3,7 +3,7 @@
services:
db:
- image: mariadb:12.2.2
+ image: mariadb:12.3.2
command: --max_allowed_packet=3250585600
environment:
MYSQL_ROOT_PASSWORD: "{{ secret__sunders_db_root_password }}"
diff --git a/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 b/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2
index b8a4cf2..5de121b 100644
--- a/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2
@@ -13,7 +13,7 @@ services:
restart: unless-stopped
redis:
- image: docker.io/library/redis:8.6.2
+ image: docker.io/library/redis:8.8.0
ports:
- "6379:6379"
volumes:
diff --git a/resources/external/status/docker_compose/compose.yaml.j2 b/resources/external/status/docker_compose/compose.yaml.j2
index 58abefa..638ebbe 100644
--- a/resources/external/status/docker_compose/compose.yaml.j2
+++ b/resources/external/status/docker_compose/compose.yaml.j2
@@ -4,7 +4,7 @@
services:
database:
- image: docker.io/library/postgres:18.3
+ image: docker.io/library/postgres:18.4
restart: always
volumes:
- ./database:/var/lib/postgresql
@@ -16,7 +16,7 @@ services:
- gatus
gatus:
- image: ghcr.io/twin/gatus:v5.35.0
+ image: ghcr.io/twin/gatus:v5.36.0
restart: always
ports:
- "8080:8080"