From eb6bde9445bfedcde6c4fe2fbfee0da6990d991c Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Fri, 19 Jun 2026 12:04:23 +0200 Subject: [PATCH] Use new HEADERS.location feature Check the actual redirect, and not the contents of the redirected-to site. --- .../docker_compose/config/websites.yaml | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/resources/external/status/docker_compose/config/websites.yaml b/resources/external/status/docker_compose/config/websites.yaml index 867a23d..458872a 100644 --- a/resources/external/status/docker_compose/config/websites.yaml +++ b/resources/external/status/docker_compose/config/websites.yaml @@ -187,55 +187,69 @@ endpoints: - name: www.c3cat.de url: "https://www.c3cat.de" <<: *websites_redirects_defaults + client: + ignore-redirect: true conditions: - - "[STATUS] == 200" + - "[STATUS] == 302" + - "[HEADERS].location == https://c3cat.de" - "[CERTIFICATE_EXPIRATION] > 48h" - - "[BODY] == pat(*Cat Ears Operation Center*)" - name: www.c3dog.de url: "https://www.c3dog.de" <<: *websites_redirects_defaults + client: + ignore-redirect: true conditions: - - "[STATUS] == 200" + - "[STATUS] == 302" + - "[HEADERS].location == https://c3dof.de" - "[CERTIFICATE_EXPIRATION] > 48h" - - "[BODY] == pat(*Dog Ears Operation Center*)" - name: cryptoparty.hamburg.ccc.de url: "https://cryptoparty.hamburg.ccc.de" <<: *websites_redirects_defaults + client: + ignore-redirect: true conditions: - - "[STATUS] == 200" + - "[STATUS] == 302" + - "[HEADERS].location == https://cryptoparty-hamburg.de" - "[CERTIFICATE_EXPIRATION] > 48h" - - "[BODY] == pat(*Digitale Selbstverteidigung in Hamburg*)" - name: local.ccc.de url: "https://local.ccc.de" <<: *websites_redirects_defaults + client: + ignore-redirect: true conditions: - - "[STATUS] == 200" + - "[STATUS] == 302" + - "[HEADERS].location == https://cpu.ccc.de" - "[CERTIFICATE_EXPIRATION] > 48h" - - "[BODY] == pat(*cpu.ccc.de | aus den Dezentralen*)" - name: lokal.ccc.de url: "https://lokal.ccc.de" <<: *websites_redirects_defaults + client: + ignore-redirect: true conditions: - - "[STATUS] == 200" + - "[STATUS] == 302" + - "[HEADERS].location == https://cpu.ccc.de" - "[CERTIFICATE_EXPIRATION] > 48h" - - "[BODY] == pat(*cpu.ccc.de | aus den Dezentralen*)" - name: staging.cryptoparty.hamburg.ccc.de url: "https://staging.cryptoparty.hamburg.ccc.de" <<: *websites_redirects_defaults + client: + ignore-redirect: true conditions: - - "[STATUS] == 200" + - "[STATUS] == 302" + - "[HEADERS].location == https://staging.cryptoparty-hamburg.de" - "[CERTIFICATE_EXPIRATION] > 48h" - - "[BODY] == pat(*cryptoparty-hamburg.de Staging Environment*)" - name: www.hamburg.ccc.de url: "https://www.hamburg.ccc.de" <<: *websites_redirects_defaults + client: + ignore-redirect: true conditions: - - "[STATUS] == 200" + - "[STATUS] == 302" + - "[HEADERS].location == https://hamburg.ccc.de/" - "[CERTIFICATE_EXPIRATION] > 48h" - - "[BODY] == pat(*STATUS_CANARY_HAMBURG_CCC_DE_DO_NOT_TOUCH*)"