From f4c9d203dae6b79060130cc03be3282489c65371 Mon Sep 17 00:00:00 2001 From: June Date: Sat, 11 Apr 2026 20:45:24 +0200 Subject: [PATCH 1/2] public-reverse-proxy(host): add config for staging.c3dog.de --- .../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 5ebed4f..2bdf9cc 100644 --- a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf +++ b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf @@ -6,6 +6,7 @@ map $host $upstream_acme_challenge_host { staging.c3cat.de 172.31.17.151:31820; c3dog.de 172.31.17.151:31820; www.c3dog.de 172.31.17.151:31820; + staging.c3dog.de 172.31.17.151:31820; ccchoir.de ccchoir.hosts.hamburg.ccc.de:31820; www.ccchoir.de ccchoir.hosts.hamburg.ccc.de:31820; cloud.hamburg.ccc.de cloud.hosts.hamburg.ccc.de:31820; diff --git a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf index 8b90d3f..a7abf03 100644 --- a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf +++ b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf @@ -51,6 +51,7 @@ stream { staging.c3cat.de 172.31.17.151:8443; c3dog.de 172.31.17.151:8443; www.c3dog.de 172.31.17.151:8443; + staging.c3dog.de 172.31.17.151:8443; git.hamburg.ccc.de 172.31.17.154:8443; eh03.easterhegg.eu 172.31.17.151:8443; eh05.easterhegg.eu 172.31.17.151:8443; From 1d2d03e4b3caac0e419e7f57cf56b949224e10ca Mon Sep 17 00:00:00 2001 From: June Date: Sat, 11 Apr 2026 20:53:18 +0200 Subject: [PATCH 2/2] status(host): add monitoring for (www./staging.)c3dog.de --- .../docker_compose/config/websites.yaml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/resources/external/status/docker_compose/config/websites.yaml b/resources/external/status/docker_compose/config/websites.yaml index 964a866..78426f6 100644 --- a/resources/external/status/docker_compose/config/websites.yaml +++ b/resources/external/status/docker_compose/config/websites.yaml @@ -52,6 +52,14 @@ endpoints: - "[CERTIFICATE_EXPIRATION] > 48h" - "[BODY] == pat(*Cat Ears Operation Center*)" + - name: c3dog.de + url: "https://c3dog.de" + <<: *websites_defaults + conditions: + - "[STATUS] == 200" + - "[CERTIFICATE_EXPIRATION] > 48h" + - "[BODY] == pat(*Dog Ears Operation Center*)" + - name: cpu.ccc.de url: "https://cpu.ccc.de" <<: *websites_defaults @@ -127,6 +135,14 @@ endpoints: - "[CERTIFICATE_EXPIRATION] > 48h" - "[BODY] == pat(*c3cat.de Staging Environment*)" + - name: staging.c3dog.de + url: "https://staging.c3dog.de" + <<: *websites_staging_defaults + conditions: + - "[STATUS] == 200" + - "[CERTIFICATE_EXPIRATION] > 48h" + - "[BODY] == pat(*c3dog.de Staging Environment*)" + - name: staging.cryptoparty-hamburg.de url: "https://staging.cryptoparty-hamburg.de" <<: *websites_staging_defaults @@ -168,6 +184,14 @@ endpoints: - "[CERTIFICATE_EXPIRATION] > 48h" - "[BODY] == pat(*Cat Ears Operation Center*)" + - name: www.c3dog.de + url: "https://www.c3dog.de" + <<: *websites_redirects_defaults + conditions: + - "[STATUS] == 200" + - "[CERTIFICATE_EXPIRATION] > 48h" + - "[BODY] == pat(*Dog Ears Operation Center*)" + - name: cryptoparty.hamburg.ccc.de url: "https://cryptoparty.hamburg.ccc.de" <<: *websites_redirects_defaults