From 53ba5b9561bda753291f80a828cb0bacf27dae09 Mon Sep 17 00:00:00 2001
From: Stefan Bethke <stb@lassitu.de>
Date: Thu, 7 Dec 2023 20:05:10 +0100
Subject: [PATCH] Website dazu

---
 .../hackertours/nginx/hackertours.hamburg.ccc.de.conf    | 8 ++++++++
 .../chaosknoten/configs/hackertours/compose.yaml.j2      | 9 ++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/playbooks/files/chaosknoten/configs/hackertours/nginx/hackertours.hamburg.ccc.de.conf b/playbooks/files/chaosknoten/configs/hackertours/nginx/hackertours.hamburg.ccc.de.conf
index eb15536..aafb084 100644
--- a/playbooks/files/chaosknoten/configs/hackertours/nginx/hackertours.hamburg.ccc.de.conf
+++ b/playbooks/files/chaosknoten/configs/hackertours/nginx/hackertours.hamburg.ccc.de.conf
@@ -36,7 +36,15 @@ 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|js|posts|tours)(.*)$ {
+        proxy_pass http://127.0.0.1:8888/$1$2;
+    }
+
     location / {
         proxy_pass http://127.0.0.1:8345/;
     }
+
 }
diff --git a/playbooks/templates/chaosknoten/configs/hackertours/compose.yaml.j2 b/playbooks/templates/chaosknoten/configs/hackertours/compose.yaml.j2
index c0cdeda..2673346 100644
--- a/playbooks/templates/chaosknoten/configs/hackertours/compose.yaml.j2
+++ b/playbooks/templates/chaosknoten/configs/hackertours/compose.yaml.j2
@@ -45,12 +45,19 @@ services:
       - "CELERY_BACKEND=redis://redis/0"
       - "CELERY_BROKER=redis://redis/1"
     volumes:
-      - pretix:/rdata
+      - pretix:/data
     restart: always
     networks:
       backend:
       frontend:
 
+  web:
+    image: gitlab-cr.hamburg.ccc.de/ccchh/hackertours/hackertours:latest
+    ports: 
+      - "8888:80"
+    restart: always
+    networks:
+      frontend:
 
 volumes:
   database: {}