diff --git a/inventories/chaosknoten/hosts.yaml b/inventories/chaosknoten/hosts.yaml index bd016b1..30d9e72 100644 --- a/inventories/chaosknoten/hosts.yaml +++ b/inventories/chaosknoten/hosts.yaml @@ -8,6 +8,7 @@ all: ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666 hackertours: ansible_host: hackertours-intern.hamburg.ccc.de + ansible_port: 42666 ansible_user: chaos ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666 keycloak: diff --git a/playbooks/files/chaosknoten/configs/hackertours/hackertours.hamburg.ccc.de.conf b/playbooks/files/chaosknoten/configs/hackertours/nginx/hackertours.hamburg.ccc.de.conf similarity index 97% rename from playbooks/files/chaosknoten/configs/hackertours/hackertours.hamburg.ccc.de.conf rename to playbooks/files/chaosknoten/configs/hackertours/nginx/hackertours.hamburg.ccc.de.conf index 83fc399..eb15536 100644 --- a/playbooks/files/chaosknoten/configs/hackertours/hackertours.hamburg.ccc.de.conf +++ b/playbooks/files/chaosknoten/configs/hackertours/nginx/hackertours.hamburg.ccc.de.conf @@ -37,6 +37,6 @@ server { proxy_set_header Forwarded "for=$remote_addr;proto=https;host=$host;by=_hidden"; location / { - proxy_pass http://127.0.0.1:80/; + proxy_pass http://127.0.0.1:8345/; } } 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 de6c953..b1fa401 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 @@ -6,6 +6,7 @@ map $host $upstream_acme_challenge_host { aes.ccchh.net 172.31.17.145:31820; wiki.ccchh.net 172.31.17.146:31820; onlyoffice.hamburg.ccc.de 172.31.17.147:31820; + hackertours.hamburg.ccc.de 172.31.17.148:31820; netbox.hamburg.ccc.de 172.31.17.149:31820; matrix.hamburg.ccc.de 172.31.17.150:31820; element.hamburg.ccc.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 07a6ea5..2428037 100644 --- a/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf +++ b/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf @@ -25,6 +25,7 @@ stream { aes.ccchh.net 172.31.17.145:8443; wiki.ccchh.net 172.31.17.146:8443; onlyoffice.hamburg.ccc.de 172.31.17.147:8443; + hackertours.hamburg.ccc.de 172.31.17.148:8443; netbox.hamburg.ccc.de 172.31.17.149:8443; matrix.hamburg.ccc.de 172.31.17.150:8443; element.hamburg.ccc.de 172.31.17.151:8443; diff --git a/playbooks/templates/chaosknoten/configs/hackertours/compose.yaml.j2 b/playbooks/templates/chaosknoten/configs/hackertours/compose.yaml.j2 index 256d956..c0cdeda 100644 --- a/playbooks/templates/chaosknoten/configs/hackertours/compose.yaml.j2 +++ b/playbooks/templates/chaosknoten/configs/hackertours/compose.yaml.j2 @@ -23,9 +23,14 @@ services: # run redis-server, save a snapshot every 60 seconds if there has been at least 1 write command: ["redis-server", "--save", "60", "1"] restart: always + networks: + backend: pretix: image: gitlab-cr.hamburg.ccc.de/ccchh/ccchh-pretix/ccchh-pretix:23.10.0 + command: ["all"] + ports: + - "8345:80" environment: - "PRETIX_INSTANCE_NAME=CCCHH Hackertours" - "PRETIX_URL=http://hackertours.hamburg.ccc.de" @@ -34,7 +39,7 @@ services: - "DATABASE_USER=pretix" - "DATABASE_PASSWORD={{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/hackertours/DB_PASSWORD", create=false, missing="error") }}" - "DATABASE_HOST=database" - - "MAIL_FROM=foo@example.com" + - "MAIL_FROM=ticket@hackertours.hamburg.ccc.de" - "MAIL_HOST=cow-intern.hamburg.ccc.de" - "REDIS_LOCATION=redis://redis/0" - "CELERY_BACKEND=redis://redis/0" @@ -42,6 +47,9 @@ services: volumes: - pretix:/rdata restart: always + networks: + backend: + frontend: volumes: