From 98906db4bfbe9c1273dd4b22bc8c467da60072b5 Mon Sep 17 00:00:00 2001 From: June Date: Mon, 22 Jan 2024 22:35:38 +0100 Subject: [PATCH] Configure reverse proxy for hamburg.ccc.de, staging and www This replaces next, since the new website is now live. --- .../configs/public-reverse-proxy/nginx/acme_challenge.conf | 4 +++- .../chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf b/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf index f550057..1403e46 100644 --- a/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf +++ b/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf @@ -12,7 +12,9 @@ map $host $upstream_acme_challenge_host { matrix.hamburg.ccc.de 172.31.17.150:31820; element.hamburg.ccc.de 172.31.17.151:31820; branding-resources.hamburg.ccc.de 172.31.17.151:31820; - next.hamburg.ccc.de 172.31.17.151:31820; + www.hamburg.ccc.de 172.31.17.151:31820; + hamburg.ccc.de 172.31.17.151:31820; + staging.hamburg.ccc.de 172.31.17.151:31820; spaceapi.hamburg.ccc.de 172.31.17.151:31820; zammad.hamburg.ccc.de 172.31.17.152:31820; c3cat.de 172.31.17.151:31820; diff --git a/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf b/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf index a2191d7..c3c05ed 100644 --- a/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf +++ b/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf @@ -31,7 +31,9 @@ stream { matrix.hamburg.ccc.de 172.31.17.150:8443; element.hamburg.ccc.de 172.31.17.151:8443; branding-resources.hamburg.ccc.de 172.31.17.151:8443; - next.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; zammad.hamburg.ccc.de 172.31.17.152:8443; c3cat.de 172.31.17.151:8443;