CCCHH/ansible-infra
CCCHH/ansible-infra
4
2
Fork 1
Code Issues 6 Pull requests 4 Wiki Activity Actions

Move Pretix from hackertours to tickets

Browse source
This commit is contained in:
Stefan Bethke 2024-10-13 09:10:10 +02:00
commit 235e6e514f
7 changed files with 22 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,7 @@ map $host $upstream_acme_challenge_host {
wiki.ccchh.net 172.31.17.146:31820;
wiki.hamburg.ccc.de 172.31.17.146:31820;
www.hamburg.ccc.de 172.31.17.151:31820;
tickets.hamburg.ccc.de 172.31.17.148:31820;
zammad.hamburg.ccc.de 172.31.17.152:31820;
eh03.easterhegg.eu 172.31.17.151:31820;
eh05.easterhegg.eu 172.31.17.151:31820;

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

@ -40,6 +40,7 @@ stream {
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;
tickets.hamburg.ccc.de 172.31.17.148:8443;
zammad.hamburg.ccc.de 172.31.17.152:8443;
c3cat.de 172.31.17.151:8443;
git.hamburg.ccc.de 172.31.17.154:8443;

15
playbooks/files/chaosknoten/configs/hackertours/nginx/hackertours.hamburg.ccc.de.conf → playbooks/files/chaosknoten/configs/tickets/nginx/tickets.hamburg.ccc.de.conf
View file

@ -12,12 +12,12 @@ server {
# header.
real_ip_header proxy_protocol;
server_name hackertours.hamburg.ccc.de;
server_name tickets.hamburg.ccc.de;
ssl_certificate /etc/letsencrypt/live/hackertours.hamburg.ccc.de/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/hackertours.hamburg.ccc.de/privkey.pem;
ssl_certificate /etc/letsencrypt/live/tickets.hamburg.ccc.de/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/tickets.hamburg.ccc.de/privkey.pem;
# verify chain of trust of OCSP response using Root CA and Intermediate certs
ssl_trusted_certificate /etc/letsencrypt/live/hackertours.hamburg.ccc.de/chain.pem;
ssl_trusted_certificate /etc/letsencrypt/live/tickets.hamburg.ccc.de/chain.pem;
# HSTS (ngx_http_headers_module is required) (63072000 seconds)
add_header Strict-Transport-Security "max-age=63072000" always;
@ -36,13 +36,6 @@ server {
# Also provide "_hidden" for by, since it's not relevant.
proxy_set_header Forwarded "for=$remote_addr;proto=https;host=$host;by=_hidden";
location = / {
proxy_pass http://127.0.0.1:8888/;
}
location ~ ^/(apple-touch-icon.png|assets|css|de|en|js|posts|tours)(.*)$ {
proxy_pass http://127.0.0.1:8888/$1$2;
}
location / {
proxy_pass http://127.0.0.1:8345/;
}