vex2: dokuwiki: userewrite:1

diff --git a/ansible/host_vars/vex2/dokuwiki.yml b/ansible/host_vars/vex2/dokuwiki.yml
index 82012e6..e29149c 100644 (file)
--- a/ansible/host_vars/vex2/dokuwiki.yml
+++ b/ansible/host_vars/vex2/dokuwiki.yml
@@ -61,4 +61,5 @@ dokuwiki_config:
   mailfrom: 'noreply@wiki.realraum.at'
   sitemap: 5
   dnslookups: 0
+  userewrite: 1
 

diff --git a/ansible/roles/web/realraumat/templates/www.realraum.at.j2 b/ansible/roles/web/realraumat/templates/www.realraum.at.j2
index 6a19f8e..db4760f 100644 (file)
--- a/ansible/roles/web/realraumat/templates/www.realraum.at.j2
+++ b/ansible/roles/web/realraumat/templates/www.realraum.at.j2
@@ -1,3 +1,7 @@
+map $request_uri $wiki_page {
+    ~^/wiki/doku\.php\?(.+&)?id=([^&]*) $2;
+}
+
 server {
     listen [::]:443 ssl;
     listen 443 ssl;
@@ -25,8 +29,8 @@ server {
         return 302 https://wp.realraum.at$request_uri;
     }
 
-    location ~ ^/wiki/(.*)$ {
-        return 302 https://doku.realraum.at/$1;
+    location ~ ^/wiki/doku\.php {
+        return 302 https://doku.realraum.at/$wiki_page;
     }
 
     # Specific file redirects to status subdomain