diff docker/httpd-wiki.conf @ 9754:cd07130ded8d 3.2.x

Route GWT client through wiki container This reduces the need for local configuration changes to get a working Docker-based setup.
author Tom Gottfried <tom@intevation.de>
date Wed, 12 Oct 2022 10:45:13 +0200
parents 414647dc6936
children 0834c2591e14
line wrap: on
line diff
--- a/docker/httpd-wiki.conf	Tue Oct 11 14:02:20 2022 +0200
+++ b/docker/httpd-wiki.conf	Wed Oct 12 10:45:13 2022 +0200
@@ -1,7 +1,13 @@
 ErrorLog /dev/stderr
 CustomLog /dev/stdout combined
 
-WSGIScriptAlias / /opt/wiki/moin-1.9.9/wiki/server/moin.wsgi
+# GWT client
+RedirectMatch "^/$" "/d4e-river"
+ProxyPass "/d4e-river" "ajp://d4eriver-client:8009/d4e-river"
+ProxyPassReverse "/d4e-river" "ajp://d4eriver-client:8009/d4e-river"
+
+# Wiki
+WSGIScriptAlias /wiki /opt/wiki/moin-1.9.9/wiki/server/moin.wsgi
 WSGIDaemonProcess moin user=wiki group=wiki \
     python-path=/opt/wiki/moin-1.9.9 \
     processes=5 threads=10 maximum-requests=1000 umask=0007

http://dive4elements.wald.intevation.org