diff --git a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf index 6cd53d3..1fa5b04 100644 --- a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf +++ b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf @@ -1,92 +1,92 @@ # Keep this sorted alphabetically, please! map $host $upstream_acme_challenge_host { - branding-resources.hamburg.ccc.de 172.31.17.151:31820; - c3cat.de 172.31.17.151:31820; - www.c3cat.de 172.31.17.151:31820; - 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; + branding-resources.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + c3cat.de public-web-static.hosts.hamburg.ccc.de:31820; + www.c3cat.de public-web-static.hosts.hamburg.ccc.de:31820; + staging.c3cat.de public-web-static.hosts.hamburg.ccc.de:31820; + c3dog.de public-web-static.hosts.hamburg.ccc.de:31820; + www.c3dog.de public-web-static.hosts.hamburg.ccc.de:31820; + staging.c3dog.de public-web-static.hosts.hamburg.ccc.de: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; - element.hamburg.ccc.de 172.31.17.151:31820; + element.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; git.hamburg.ccc.de 172.31.17.154:31820; grafana.hamburg.ccc.de grafana.hosts.hamburg.ccc.de:31820; alerta.hamburg.ccc.de grafana.hosts.hamburg.ccc.de:31820; - hackertours.hamburg.ccc.de 172.31.17.151:31820; - staging.hackertours.hamburg.ccc.de 172.31.17.151:31820; - hamburg.ccc.de 172.31.17.151:31820; + hackertours.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + staging.hackertours.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; id.hamburg.ccc.de keycloak.hosts.hamburg.ccc.de:31820; invite.hamburg.ccc.de keycloak.hosts.hamburg.ccc.de:31820; keycloak-admin.hamburg.ccc.de keycloak.hosts.hamburg.ccc.de:31820; matrix.hamburg.ccc.de 172.31.17.150:31820; mas.hamburg.ccc.de 172.31.17.150:31820; - element-admin.hamburg.ccc.de 172.31.17.151:31820; + element-admin.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; netbox.hamburg.ccc.de netbox.hosts.hamburg.ccc.de:31820; onlyoffice.hamburg.ccc.de onlyoffice.hosts.hamburg.ccc.de:31820; pad.hamburg.ccc.de pad.hosts.hamburg.ccc.de:31820; - spaceapi.hamburg.ccc.de 172.31.17.151:31820; - staging.hamburg.ccc.de 172.31.17.151:31820; + spaceapi.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + staging.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; wiki.ccchh.net wiki.hosts.hamburg.ccc.de:31820; wiki.hamburg.ccc.de wiki.hosts.hamburg.ccc.de:31820; - www.hamburg.ccc.de 172.31.17.151:31820; + www.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; tickets.hamburg.ccc.de tickets.hosts.hamburg.ccc.de:31820; zammad.hamburg.ccc.de zammad.hosts.hamburg.ccc.de:31820; - eh03.easterhegg.eu 172.31.17.151:31820; - eh05.easterhegg.eu 172.31.17.151:31820; - eh07.easterhegg.eu 172.31.17.151:31820; - eh09.easterhegg.eu 172.31.17.151:31820; - eh11.easterhegg.eu 172.31.17.151:31820; - eh20.easterhegg.eu 172.31.17.151:31820; - www.eh20.easterhegg.eu 172.31.17.151:31820; + eh03.easterhegg.eu public-web-static.hosts.hamburg.ccc.de:31820; + eh05.easterhegg.eu public-web-static.hosts.hamburg.ccc.de:31820; + eh07.easterhegg.eu public-web-static.hosts.hamburg.ccc.de:31820; + eh09.easterhegg.eu public-web-static.hosts.hamburg.ccc.de:31820; + eh11.easterhegg.eu public-web-static.hosts.hamburg.ccc.de:31820; + eh20.easterhegg.eu public-web-static.hosts.hamburg.ccc.de:31820; + www.eh20.easterhegg.eu public-web-static.hosts.hamburg.ccc.de:31820; eh22.easterhegg.eu eh22-wiki.hosts.hamburg.ccc.de:31820; - easterheggxxxx.hamburg.ccc.de 172.31.17.151:31820; - eh2003.hamburg.ccc.de 172.31.17.151:31820; - www.eh2003.hamburg.ccc.de 172.31.17.151:31820; - easterhegg2003.hamburg.ccc.de 172.31.17.151:31820; - www.easterhegg2003.hamburg.ccc.de 172.31.17.151:31820; - eh2005.hamburg.ccc.de 172.31.17.151:31820; - www.eh2005.hamburg.ccc.de 172.31.17.151:31820; - easterhegg2005.hamburg.ccc.de 172.31.17.151:31820; - www.easterhegg2005.hamburg.ccc.de 172.31.17.151:31820; - eh2007.hamburg.ccc.de 172.31.17.151:31820; - www.eh2007.hamburg.ccc.de 172.31.17.151:31820; - eh07.hamburg.ccc.de 172.31.17.151:31820; - www.eh07.hamburg.ccc.de 172.31.17.151:31820; - easterhegg2007.hamburg.ccc.de 172.31.17.151:31820; - www.easterhegg2007.hamburg.ccc.de 172.31.17.151:31820; - eh2009.hamburg.ccc.de 172.31.17.151:31820; - www.eh2009.hamburg.ccc.de 172.31.17.151:31820; - eh09.hamburg.ccc.de 172.31.17.151:31820; - www.eh09.hamburg.ccc.de 172.31.17.151:31820; - easterhegg2009.hamburg.ccc.de 172.31.17.151:31820; - www.easterhegg2009.hamburg.ccc.de 172.31.17.151:31820; - eh2011.hamburg.ccc.de 172.31.17.151:31820; - www.eh2011.hamburg.ccc.de 172.31.17.151:31820; - eh11.hamburg.ccc.de 172.31.17.151:31820; - www.eh11.hamburg.ccc.de 172.31.17.151:31820; - easterhegg2011.hamburg.ccc.de 172.31.17.151:31820; - www.easterhegg2011.hamburg.ccc.de 172.31.17.151:31820; - eh20.hamburg.ccc.de 172.31.17.151:31820; - hacker.tours 172.31.17.151:31820; - staging.hacker.tours 172.31.17.151:31820; + easterheggxxxx.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + eh2003.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + www.eh2003.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + easterhegg2003.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + www.easterhegg2003.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + eh2005.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + www.eh2005.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + easterhegg2005.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + www.easterhegg2005.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + eh2007.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + www.eh2007.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + eh07.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + www.eh07.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + easterhegg2007.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + www.easterhegg2007.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + eh2009.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + www.eh2009.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + eh09.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + www.eh09.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + easterhegg2009.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + www.easterhegg2009.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + eh2011.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + www.eh2011.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + eh11.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + www.eh11.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + easterhegg2011.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + www.easterhegg2011.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + eh20.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + hacker.tours public-web-static.hosts.hamburg.ccc.de:31820; + staging.hacker.tours public-web-static.hosts.hamburg.ccc.de:31820; woodpecker.hamburg.ccc.de 172.31.17.160:31820; design.hamburg.ccc.de 172.31.17.162:31820; hydra.hamburg.ccc.de 172.31.17.163:31820; ntfy.hamburg.ccc.de ntfy.hosts.hamburg.ccc.de:31820; - cryptoparty-hamburg.de 172.31.17.151:31820; - cryptoparty.hamburg.ccc.de 172.31.17.151:31820; - staging.cryptoparty-hamburg.de 172.31.17.151:31820; - staging.cryptoparty.hamburg.ccc.de 172.31.17.151:31820; + cryptoparty-hamburg.de public-web-static.hosts.hamburg.ccc.de:31820; + cryptoparty.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + staging.cryptoparty-hamburg.de public-web-static.hosts.hamburg.ccc.de:31820; + staging.cryptoparty.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; spaceapi.ccc.de spaceapiccc.hosts.hamburg.ccc.de:31820; - cpu.ccc.de 172.31.17.151:31820; - lokal.ccc.de 172.31.17.151:31820; - local.ccc.de 172.31.17.151:31820; + cpu.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + lokal.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; + local.ccc.de public-web-static.hosts.hamburg.ccc.de:31820; acmedns.hamburg.ccc.de acmedns.hosts.hamburg.ccc.de:31820; - diday.org 172.31.17.151:31820; - docs.c3voc.de 172.31.17.151:31820; - staging.docs.c3voc.de 172.31.17.151:31820; + diday.org public-web-static.hosts.hamburg.ccc.de:31820; + docs.c3voc.de public-web-static.hosts.hamburg.ccc.de:31820; + staging.docs.c3voc.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 fb0d37a..8145895 100644 --- a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf +++ b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf @@ -32,84 +32,84 @@ stream { wiki.ccchh.net wiki.hosts.hamburg.ccc.de:8443; wiki.hamburg.ccc.de wiki.hosts.hamburg.ccc.de:8443; onlyoffice.hamburg.ccc.de onlyoffice.hosts.hamburg.ccc.de:8443; - hackertours.hamburg.ccc.de 172.31.17.151:8443; - staging.hackertours.hamburg.ccc.de 172.31.17.151:8443; + hackertours.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + staging.hackertours.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; netbox.hamburg.ccc.de netbox.hosts.hamburg.ccc.de:8443; matrix.hamburg.ccc.de 172.31.17.150:8443; mas.hamburg.ccc.de 172.31.17.150:8443; - element-admin.hamburg.ccc.de 172.31.17.151:8443; - element.hamburg.ccc.de 172.31.17.151:8443; - branding-resources.hamburg.ccc.de 172.31.17.151:8443; - www.hamburg.ccc.de 172.31.17.151:8443; - hamburg.ccc.de 172.31.17.151:8443; - staging.hamburg.ccc.de 172.31.17.151:8443; - spaceapi.hamburg.ccc.de 172.31.17.151:8443; + element-admin.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + element.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + branding-resources.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + www.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + staging.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + spaceapi.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; tickets.hamburg.ccc.de tickets.hosts.hamburg.ccc.de:8443; sunders.hamburg.ccc.de sunders.hosts.hamburg.ccc.de:8443; zammad.hamburg.ccc.de zammad.hosts.hamburg.ccc.de:8443; - c3cat.de 172.31.17.151:8443; - www.c3cat.de 172.31.17.151:8443; - 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; + c3cat.de public-web-static.hosts.hamburg.ccc.de:8443; + www.c3cat.de public-web-static.hosts.hamburg.ccc.de:8443; + staging.c3cat.de public-web-static.hosts.hamburg.ccc.de:8443; + c3dog.de public-web-static.hosts.hamburg.ccc.de:8443; + www.c3dog.de public-web-static.hosts.hamburg.ccc.de:8443; + staging.c3dog.de public-web-static.hosts.hamburg.ccc.de: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; - eh07.easterhegg.eu 172.31.17.151:8443; - eh09.easterhegg.eu 172.31.17.151:8443; - eh11.easterhegg.eu 172.31.17.151:8443; - eh20.easterhegg.eu 172.31.17.151:8443; - www.eh20.easterhegg.eu 172.31.17.151:8443; + eh03.easterhegg.eu public-web-static.hosts.hamburg.ccc.de:8443; + eh05.easterhegg.eu public-web-static.hosts.hamburg.ccc.de:8443; + eh07.easterhegg.eu public-web-static.hosts.hamburg.ccc.de:8443; + eh09.easterhegg.eu public-web-static.hosts.hamburg.ccc.de:8443; + eh11.easterhegg.eu public-web-static.hosts.hamburg.ccc.de:8443; + eh20.easterhegg.eu public-web-static.hosts.hamburg.ccc.de:8443; + www.eh20.easterhegg.eu public-web-static.hosts.hamburg.ccc.de:8443; eh22.easterhegg.eu eh22-wiki.hosts.hamburg.ccc.de:8443; - easterheggxxxx.hamburg.ccc.de 172.31.17.151:8443; - eh2003.hamburg.ccc.de 172.31.17.151:8443; - www.eh2003.hamburg.ccc.de 172.31.17.151:8443; - easterhegg2003.hamburg.ccc.de 172.31.17.151:8443; - www.easterhegg2003.hamburg.ccc.de 172.31.17.151:8443; - eh2005.hamburg.ccc.de 172.31.17.151:8443; - www.eh2005.hamburg.ccc.de 172.31.17.151:8443; - easterhegg2005.hamburg.ccc.de 172.31.17.151:8443; - www.easterhegg2005.hamburg.ccc.de 172.31.17.151:8443; - eh2007.hamburg.ccc.de 172.31.17.151:8443; - www.eh2007.hamburg.ccc.de 172.31.17.151:8443; - eh07.hamburg.ccc.de 172.31.17.151:8443; - www.eh07.hamburg.ccc.de 172.31.17.151:8443; - easterhegg2007.hamburg.ccc.de 172.31.17.151:8443; - www.easterhegg2007.hamburg.ccc.de 172.31.17.151:8443; - eh2009.hamburg.ccc.de 172.31.17.151:8443; - www.eh2009.hamburg.ccc.de 172.31.17.151:8443; - eh09.hamburg.ccc.de 172.31.17.151:8443; - www.eh09.hamburg.ccc.de 172.31.17.151:8443; - easterhegg2009.hamburg.ccc.de 172.31.17.151:8443; - www.easterhegg2009.hamburg.ccc.de 172.31.17.151:8443; - eh2011.hamburg.ccc.de 172.31.17.151:8443; - www.eh2011.hamburg.ccc.de 172.31.17.151:8443; - eh11.hamburg.ccc.de 172.31.17.151:8443; - www.eh11.hamburg.ccc.de 172.31.17.151:8443; - easterhegg2011.hamburg.ccc.de 172.31.17.151:8443; - www.easterhegg2011.hamburg.ccc.de 172.31.17.151:8443; - eh20.hamburg.ccc.de 172.31.17.151:8443; - hacker.tours 172.31.17.151:8443; - staging.hacker.tours 172.31.17.151:8443; + easterheggxxxx.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + eh2003.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + www.eh2003.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + easterhegg2003.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + www.easterhegg2003.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + eh2005.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + www.eh2005.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + easterhegg2005.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + www.easterhegg2005.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + eh2007.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + www.eh2007.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + eh07.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + www.eh07.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + easterhegg2007.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + www.easterhegg2007.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + eh2009.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + www.eh2009.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + eh09.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + www.eh09.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + easterhegg2009.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + www.easterhegg2009.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + eh2011.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + www.eh2011.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + eh11.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + www.eh11.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + easterhegg2011.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + www.easterhegg2011.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + eh20.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + hacker.tours public-web-static.hosts.hamburg.ccc.de:8443; + staging.hacker.tours public-web-static.hosts.hamburg.ccc.de:8443; woodpecker.hamburg.ccc.de 172.31.17.160:8443; design.hamburg.ccc.de 172.31.17.162:8443; hydra.hamburg.ccc.de 172.31.17.163:8443; cfp.eh22.easterhegg.eu pretalx.hosts.hamburg.ccc.de:8443; ntfy.hamburg.ccc.de ntfy.hosts.hamburg.ccc.de:8443; - cryptoparty-hamburg.de 172.31.17.151:8443; - cryptoparty.hamburg.ccc.de 172.31.17.151:8443; - staging.cryptoparty-hamburg.de 172.31.17.151:8443; - staging.cryptoparty.hamburg.ccc.de 172.31.17.151:8443; + cryptoparty-hamburg.de public-web-static.hosts.hamburg.ccc.de:8443; + cryptoparty.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + staging.cryptoparty-hamburg.de public-web-static.hosts.hamburg.ccc.de:8443; + staging.cryptoparty.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; spaceapi.ccc.de spaceapiccc.hosts.hamburg.ccc.de:8443; - cpu.ccc.de 172.31.17.151:8443; - lokal.ccc.de 172.31.17.151:8443; - local.ccc.de 172.31.17.151:8443; + cpu.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + lokal.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; + local.ccc.de public-web-static.hosts.hamburg.ccc.de:8443; acmedns.hamburg.ccc.de acmedns.hosts.hamburg.ccc.de:8443; - diday.org 172.31.17.151:8443; - *.staging.diday.org 172.31.17.151:8443; - docs.c3voc.de 172.31.17.151:8443; - staging.docs.c3voc.de 172.31.17.151:8443; + diday.org public-web-static.hosts.hamburg.ccc.de:8443; + *.staging.diday.org public-web-static.hosts.hamburg.ccc.de:8443; + docs.c3voc.de public-web-static.hosts.hamburg.ccc.de:8443; + staging.docs.c3voc.de public-web-static.hosts.hamburg.ccc.de:8443; } server {