From 05149f42fa30964e8deab89c3ffd4f9bff26420d Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Mon, 15 Jun 2026 19:14:42 +0200 Subject: [PATCH 1/5] Use canary comment instead of actual content Please only merge after https://git.hamburg.ccc.de/CCCHH/ccchh-website/pulls/170 --- resources/external/status/docker_compose/config/websites.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/external/status/docker_compose/config/websites.yaml b/resources/external/status/docker_compose/config/websites.yaml index e4cbc8d..3d1ab22 100644 --- a/resources/external/status/docker_compose/config/websites.yaml +++ b/resources/external/status/docker_compose/config/websites.yaml @@ -124,7 +124,7 @@ endpoints: conditions: - "[STATUS] == 200" - "[CERTIFICATE_EXPIRATION] > 48h" - - "[BODY] == pat(*Wir sind der Chaos Computer Club der Hansestadt Hamburg:*)" + - "[BODY] == pat(*STATUS_CANARY_DO_NOT_TOUCH*)" - name: spaceapi.ccc.de url: "https://spaceapi.ccc.de" From d10807f5c8151ec1860632364d4dbf30b99821cd Mon Sep 17 00:00:00 2001 From: Renovate Date: Mon, 15 Jun 2026 17:16:17 +0000 Subject: [PATCH 2/5] 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 }}" From e5fa86468a22f3899ec7ce54c339835bead43456 Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Mon, 15 Jun 2026 19:56:15 +0200 Subject: [PATCH 3/5] Encode domain in canary --- resources/external/status/docker_compose/config/websites.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/external/status/docker_compose/config/websites.yaml b/resources/external/status/docker_compose/config/websites.yaml index 3d1ab22..c470efa 100644 --- a/resources/external/status/docker_compose/config/websites.yaml +++ b/resources/external/status/docker_compose/config/websites.yaml @@ -124,7 +124,7 @@ endpoints: conditions: - "[STATUS] == 200" - "[CERTIFICATE_EXPIRATION] > 48h" - - "[BODY] == pat(*STATUS_CANARY_DO_NOT_TOUCH*)" + - "[BODY] == pat(*STATUS_CANARY_HAMBURG_CCC_DE_DO_NOT_TOUCH*)" - name: spaceapi.ccc.de url: "https://spaceapi.ccc.de" From 8b924c924f409fddc8ea29a593b295d0297a7c6c Mon Sep 17 00:00:00 2001 From: Renovate Date: Thu, 18 Jun 2026 15:15:51 +0000 Subject: [PATCH 4/5] Update actions/checkout action to v7 --- .forgejo/workflows/deploy-docs.yaml | 2 +- .forgejo/workflows/lint.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/deploy-docs.yaml b/.forgejo/workflows/deploy-docs.yaml index 537d983..6e0acd6 100644 --- a/.forgejo/workflows/deploy-docs.yaml +++ b/.forgejo/workflows/deploy-docs.yaml @@ -23,7 +23,7 @@ jobs: apt -y install nodejs git rsync openssh-client pip install --upgrade pip - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Install Python packages run: | diff --git a/.forgejo/workflows/lint.yaml b/.forgejo/workflows/lint.yaml index bdd53f5..2007d24 100644 --- a/.forgejo/workflows/lint.yaml +++ b/.forgejo/workflows/lint.yaml @@ -10,7 +10,7 @@ jobs: name: Ansible Lint runs-on: docker steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Install pip run: | apt update From c20960d06a205b5f716763ca3032f2b4bcef8832 Mon Sep 17 00:00:00 2001 From: Renovate Date: Fri, 19 Jun 2026 07:16:07 +0000 Subject: [PATCH 5/5] 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 }}"