CCCHH/ansible-infra
CCCHH/ansible-infra
3
0
Fork 0
Code Issues 4 Pull requests Actions Wiki Activity

Compare commits

base: CCCHH:2659796e8b4c99ecc370e866502a8b3441557e00
Branches Tags
CCCHH:main
CCCHH:lint_and_ci
CCCHH:cleanup
..
compare: CCCHH:81c8bfe16b311d5bf4635947fa02dfb65aea7f91
Branches Tags
CCCHH:lint_and_ci
CCCHH:cleanup
CCCHH:main

3 commits
2659796e8b ... 81c8bfe16b

Author SHA1 Message Date
June 81c8bfe16b Actually keep using $uri for DokuWiki stuff since otherwise it breaks 
To be investigated if the $uri issue also applies for try_files.
 2024-01-22 22:41:12 +01:00
June 6787c7c0d7 Use $request_uri instead of $uri, since $uri allows for injection 
Thanks NixOS for pointing that out! :3
Also see here for an explanation:
https://reversebrain.github.io/2021/03/29/The-story-of-Nginx-and-uri-variable/
 2024-01-22 22:37:10 +01:00
June 98906db4bf Configure reverse proxy for hamburg.ccc.de, staging and www 
This replaces next, since the new website is now live.
 2024-01-22 22:35:38 +01:00
3 changed files with 9 additions and 5 deletions
Show stats Expand all files Collapse all files

4
playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf
View file

@ -12,7 +12,9 @@ map $host $upstream_acme_challenge_host {
matrix.hamburg.ccc.de 172.31.17.150:31820; matrix.hamburg.ccc.de 172.31.17.150:31820;
element.hamburg.ccc.de 172.31.17.151:31820; element.hamburg.ccc.de 172.31.17.151:31820;
branding-resources.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; spaceapi.hamburg.ccc.de 172.31.17.151:31820;
zammad.hamburg.ccc.de 172.31.17.152:31820; zammad.hamburg.ccc.de 172.31.17.152:31820;
c3cat.de 172.31.17.151:31820; c3cat.de 172.31.17.151:31820;

4
playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf
View file

@ -31,7 +31,9 @@ stream {
matrix.hamburg.ccc.de 172.31.17.150:8443; matrix.hamburg.ccc.de 172.31.17.150:8443;
element.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; 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; spaceapi.hamburg.ccc.de 172.31.17.151:8443;
zammad.hamburg.ccc.de 172.31.17.152:8443; zammad.hamburg.ccc.de 172.31.17.152:8443;
c3cat.de 172.31.17.151:8443; c3cat.de 172.31.17.151:8443;

6
playbooks/files/chaosknoten/configs/wiki/nginx/wiki.hamburg.ccc.de.conf
View file

@ -72,14 +72,14 @@ server {
} }
location /ChaosVPN { location /ChaosVPN {
return 302 https://oldwiki.hamburg.ccc.de$uri; return 302 https://oldwiki.hamburg.ccc.de$request_uri;
} }
location ~ /EH(07|09|11) { location ~ /EH(07|09|11) {
return 302 https://oldwiki.hamburg.ccc.de$uri; return 302 https://oldwiki.hamburg.ccc.de$request_uri;
} }
location /Easter { location /Easter {
return 302 https://oldwiki.hamburg.ccc.de$uri; return 302 https://oldwiki.hamburg.ccc.de$request_uri;
} }
} }