fix(#213): fix substitute and proxy configs

eurofurence · Dec 13, 2023 · 34b1e10 · 34b1e10
1 parent 8efa18c
commit 34b1e10
Showing 1 changed file with 26 additions and 17 deletions.
diff --git a/httpd-container.conf b/httpd-container.conf
@@ -91,36 +91,45 @@ LogLevel warn
             Allow from all
         </Proxy>
 
-        ProxyPass /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/regsys http://reg-regsys-classic:8080
-        ProxyPassReverse /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/regsys http://reg-regsys-classic:8080
+        ProxyPass /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/regsys http://regsys-classic:8080
+        ProxyPassReverse /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/regsys http://regsys-classic:8080
 
-        ProxyPass /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/attsrv/ http://reg-attendee-service:8080/
-        ProxyPassReverse /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/attsrv/ http://reg-attendee-service:8080/
+        ProxyPass /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/attsrv/ http://attendee-service:8080/
+        ProxyPassReverse /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/attsrv/ http://attendee-service:8080/
 
-        ProxyPass /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/roomsrv/ http://reg-room-service:8080/
-        ProxyPassReverse /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/roomsrv/ http://reg-room-service:8080/
+        ProxyPass /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/authsrv/ http://auth-service:8080/
+        ProxyPassReverse /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/authsrv/ http://auth-service:8080/
 
-        ProxyPass /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/authsrv/ http://reg-auth-service:8080/
-        ProxyPassReverse /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/authsrv/ http://reg-auth-service:8080/
+        ProxyPass /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/cncrdsrv/ http://payment-cncrd-adapter:8080/
+        ProxyPassReverse /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/cncrdsrv/ http://payment-cncrd-adapter:8080/
 
-        ProxyPass /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/paysrv/ http://reg-payment-service:8080/
-        ProxyPassReverse /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/paysrv/ http://reg-payment-service:8080/
+        ProxyPass /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/mailsrv/ http://mail-service:8080/
+        ProxyPassReverse /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/mailsrv/ http://mail-service:8080/
 
-        ProxyPass /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/cncrdsrv/ http://reg-payment-cncrd-adapter:8080/
-        ProxyPassReverse /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/cncrdsrv/ http://reg-payment-cncrd-adapter:8080/
+        ProxyPass /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/roomsrv/ http://room-service:8080/
+        ProxyPassReverse /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/roomsrv/ http://room-service:8080/
 
-        # ProxyPass /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/expsrv/ http://reg-export-service:8080/
-        # ProxyPassReverse /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/expsrv/ http://reg-export-service:8080/
-
-        ProxyPass /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/mailsrv/ http://reg-mail-service:8080/
-        ProxyPassReverse /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/mailsrv/ http://reg-mail-service:8080/
+        ProxyPass /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/paysrv/ http://payment-service:8080/
+        ProxyPassReverse /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/paysrv/ http://payment-service:8080/
 
         # configuration for reg-frontend
 
         RewriteEngine on
+
+        # special rules to prevent deep reloads and base link without trailing /
         RewriteRule "^/${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/app/register/[a-z-]+/.*$" "/${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/app/register/index.html"
+        RewriteRule "^/${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/app/register$" "/${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/app/register/index.html"
 
         # we have built the gatsby static app with this context base path, so we use inline content substitution
+        # and a rewrite rule
+
+        RewriteRule "^/${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/app/register/(.*)$" "/app/register/$1"
+
+        AddOutputFilterByType SUBSTITUTE text/html
+        AddOutputFilterByType SUBSTITUTE application/javascript
+        AddOutputFilterByType SUBSTITUTE text/css
+        AddOutputFilterByType SUBSTITUTE text/javascript
+		SubstituteMaxLineLength 5M
         Substitute "s|aN3nNFwFoi5QkyPaVJ54dDTDc6HrrCYGAL6U6GUuyV2uvvekgOxqYe6K2hur|${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}|n"
 
         ErrorLog /dev/stdout