diff --git a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf index 2bdf9cc..5ebed4f 100644 --- a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf +++ b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf @@ -6,7 +6,6 @@ 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 a7abf03..8b90d3f 100644 --- a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf +++ b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf @@ -51,7 +51,6 @@ 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; diff --git a/resources/external/status/docker_compose/config/websites.yaml b/resources/external/status/docker_compose/config/websites.yaml index 78426f6..964a866 100644 --- a/resources/external/status/docker_compose/config/websites.yaml +++ b/resources/external/status/docker_compose/config/websites.yaml @@ -52,14 +52,6 @@ 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 @@ -135,14 +127,6 @@ 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 @@ -184,14 +168,6 @@ 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