Haproxy: Redirect rule now uses base so you can redirect a URL +path

OpenConext · May 28, 2024 · 091583c · 091583c
1 parent 5d05e36
commit 091583c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/roles/haproxy/templates/haproxy_frontend.cfg.j2 b/roles/haproxy/templates/haproxy_frontend.cfg.j2
@@ -104,7 +104,7 @@ frontend local_ip
     acl securitytxt path /.well-known/security.txt
     http-request redirect location {{ haproxy_securitytxt_target_url }} if securitytxt
     {% endif %}
-    http-request redirect location %[req.hdr(host),lower,map(/etc/haproxy/maps/redirects.map)] if { req.hdr(host),lower,map_str(/etc/haproxy/maps/redirects.map) -m found }
+    http-request redirect location %[base,map_reg(/etc/haproxy/maps/redirects.map)] if { base,map_reg(/etc/haproxy/maps/redirects.map) -m found }
 
 {% if haproxy_sni_ip_restricted is defined %}
 #--------------------------------------------------------------------

diff --git a/roles/haproxy/templates/validvhostsunrestricted.acl.j2 b/roles/haproxy/templates/validvhostsunrestricted.acl.j2
@@ -5,6 +5,9 @@
 {% endfor %}
 {%if haproxy_redirects is defined %}
 {% for application in haproxy_redirects %}
+{%if application.hostname is defined %}
+{{ application.hostname }}
+{% endif %}
 {{ application.url }}
 {% endfor %}
 {% endif %}