From 727fc8eaaa945b21f8be36b243f4aae5ab5c54ce Mon Sep 17 00:00:00 2001
From: L3D <l3d@c3woc.de>
Date: Mon, 26 Feb 2024 12:20:23 +0100
Subject: [PATCH] Create hall1-3 for winkekatze and update l3d.ch

---
 host_vars/web01.l3d.space/vars.yml                 |  2 ++
 templates/files/nginx/sites/l3d.ch_tls.conf        |  6 ++++--
 templates/files/nginx/sites/winkekatze.tv_tls.conf | 12 ++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/host_vars/web01.l3d.space/vars.yml b/host_vars/web01.l3d.space/vars.yml
index 84a05cb..9759339 100644
--- a/host_vars/web01.l3d.space/vars.yml
+++ b/host_vars/web01.l3d.space/vars.yml
@@ -83,6 +83,8 @@ nginx_sites:
   - name: 'l3d.yt'
   - name: 'www.l3d.yt'
   - name: 'l3d.ch'
+    webroot:
+      user: 'l3d'
   - name: 'www.l3d.ch'
   - name: 'l3d.me'
   - name: 'www.l3d.me'
diff --git a/templates/files/nginx/sites/l3d.ch_tls.conf b/templates/files/nginx/sites/l3d.ch_tls.conf
index 751278d..5e148eb 100644
--- a/templates/files/nginx/sites/l3d.ch_tls.conf
+++ b/templates/files/nginx/sites/l3d.ch_tls.conf
@@ -8,8 +8,10 @@ server {
   include snippets/tls_certificate_{{ site.name }}.snippet.conf;
   include snippets/logging_{{ site.name }}.snippet.conf;
 
+  root /srv/www/l3d.ch;
+
   location / {
-    add_header X-Served-By "teapot CYBER 4.0 (with blockchain)";
-    return 418;
+    charset utf-8;
+    try_files $uri $uri/ =404;
   }
 }
diff --git a/templates/files/nginx/sites/winkekatze.tv_tls.conf b/templates/files/nginx/sites/winkekatze.tv_tls.conf
index fbcbbe5..f0dc4e2 100644
--- a/templates/files/nginx/sites/winkekatze.tv_tls.conf
+++ b/templates/files/nginx/sites/winkekatze.tv_tls.conf
@@ -22,4 +22,16 @@ server {
     charset utf-8;
     return 308 https://winkekatze.tv/events/fff_bodensee_21/;
   }
+  location /hall1/ {
+    charset utf-8;
+    return 308 https://vdo.ninja/?room=wk24_hall1&password=winkekatze&hash=7fce;
+  }
+  location /hall2/ {
+    charset utf-8;
+    return 308 https://vdo.ninja/?room=wk24_hall2&password=winkekatze&hash=7fce;
+  }
+  location /hall3/ {
+    charset utf-8;
+    return 308 https://vdo.ninja/?room=wk24_hall3&password=winkekatze&hash=7fce;
+  }
 }