From 999f413dfc592c343f1e2b59cc438246a74e57c2 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Fri, 16 Jul 2021 13:34:20 +0200
Subject: [PATCH] move wiki.franzi.business to rx300

---
 data/nginx/files/extras/rx300/wiki.franzi.business | 12 ++++++++++++
 data/powerdns/files/bind-zones/franzi.business     |  3 +--
 nodes/htz/ex42-1048908.py                          | 10 ----------
 nodes/rx300.py                                     | 11 +++++++++++
 4 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 data/nginx/files/extras/rx300/wiki.franzi.business

diff --git a/data/nginx/files/extras/rx300/wiki.franzi.business b/data/nginx/files/extras/rx300/wiki.franzi.business
new file mode 100644
index 0000000..cc1fc01
--- /dev/null
+++ b/data/nginx/files/extras/rx300/wiki.franzi.business
@@ -0,0 +1,12 @@
+    location ~ /(data|conf|bin|inc|vendor)/ {
+        deny all;
+    }
+
+    location / { try_files $uri $uri/ @dokuwiki; }
+
+    location @dokuwiki {
+        rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last;
+        rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last;
+        rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last;
+        rewrite ^/(.*) /doku.php?id=$1&$args last;
+    }
diff --git a/data/powerdns/files/bind-zones/franzi.business b/data/powerdns/files/bind-zones/franzi.business
index 3f51f55..da97226 100644
--- a/data/powerdns/files/bind-zones/franzi.business
+++ b/data/powerdns/files/bind-zones/franzi.business
@@ -33,8 +33,7 @@ unicornsden     IN  CNAME   rx300.kunbox.net.
 vliedel.random  IN  A       94.130.52.224
 vliedel.random  IN  AAAA    2a01:4f8:10b:2a5f::2
 
-wiki            IN  A       94.130.52.224
-wiki            IN  AAAA    2a01:4f8:10b:2a5f::2
+wiki            IN  CNAME   rx300.kunbox.net.
 
 _matrix._tcp    IN  SRV     10 10 443 matrix
 
diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py
index fa4c436..6a055e1 100644
--- a/nodes/htz/ex42-1048908.py
+++ b/nodes/htz/ex42-1048908.py
@@ -351,16 +351,6 @@ nodes['htz.ex42-1048908'] = {
                     'website_check_path': '/',
                     'website_check_string': 'roundcube',
                 },
-                'wiki.franzi.business': {
-                    'extras': True,
-                    'php': True,
-                    'webroot_config': {
-                        'owner': 'www-data',
-                        'group': 'www-data',
-                    },
-                    'website_check_path': '/start?do=login',
-                    'website_check_string': 'Username',
-                },
             },
             'worker_processes': 4,
         },
diff --git a/nodes/rx300.py b/nodes/rx300.py
index d418315..0a7a2e9 100644
--- a/nodes/rx300.py
+++ b/nodes/rx300.py
@@ -200,6 +200,17 @@ nodes['rx300'] = {
                         },
                     },
                 },
+                'wiki.franzi.business': {
+                    'ssl': '_.franzi.business',
+                    'extras': True,
+                    'php': True,
+                    'webroot_config': {
+                        'owner': 'www-data',
+                        'group': 'www-data',
+                    },
+                    'website_check_path': '/start?do=login',
+                    'website_check_string': 'Username',
+                },
             },
         },
         'php': {