stack/erp5: Fix path-based routing when there are multiple components in the outer prefix.

The _vh_ prefix is needed for every single outer path element for
VirtualHostMonster to be able to properly reconstruct the outer path.

software/erp5/test/test/test_balancer.py

@@ -949,10 +949,10 @@ class TestPathBasedRouting(BalancerTestCase):
         expected_path,
       )
     # Trailing slash presence is preserved.
-    assertRoutingEqual('default', '/foo/bar',       prefix + '/erp5/boo/far/faz' + vhr + '/_vh_foo/bar')
-    assertRoutingEqual('default', '/foo/bar/',      prefix + '/erp5/boo/far/faz' + vhr + '/_vh_foo/bar/')
+    assertRoutingEqual('default', '/foo/bar',       prefix + '/erp5/boo/far/faz' + vhr + '/_vh_foo/_vh_bar')
+    assertRoutingEqual('default', '/foo/bar/',      prefix + '/erp5/boo/far/faz' + vhr + '/_vh_foo/_vh_bar/')
     # Subpaths are preserved.
-    assertRoutingEqual('default', '/foo/bar/hey',   prefix + '/erp5/boo/far/faz' + vhr + '/_vh_foo/bar/hey')
+    assertRoutingEqual('default', '/foo/bar/hey',   prefix + '/erp5/boo/far/faz' + vhr + '/_vh_foo/_vh_bar/hey')
     # Rule precedence: later less-specific rules are applied.
     assertRoutingEqual('default', '/foo',           prefix + '/erp5/somewhere' + vhr + '/_vh_foo')
     assertRoutingEqual('default', '/foo/',          prefix + '/erp5/somewhere' + vhr + '/_vh_foo/')

stack/erp5/buildout.hash.cfg

@@ -90,7 +90,7 @@ md5sum = 8d3694226b6cbed961f6d608b6d6d294
 
 [template-haproxy-cfg]
 filename = haproxy.cfg.in
-md5sum = 452c502fabd5a6066c9dee533dfb1c77
+md5sum = 3f4f7e49c504cbf610fc5dc462713dfc
 
 [template-rsyslogd-cfg]
 filename = rsyslogd.cfg.in

stack/erp5/haproxy.cfg.in

@@ -176,7 +176,7 @@ listen family_{{ name }}
 
 {%   for outer_prefix, inner_prefix in family_path_routing_dict.get(name, []) + path_routing_list %}
   {%   set outer_prefix = outer_prefix.strip('/') -%}
-  http-request replace-path ^(/+VirtualHostBase/+[^/]+/+[^/]+)/+VirtualHostRoot/+({% if outer_prefix %}{{ outer_prefix }}($|/.*){% else %}.*{% endif %}) \1/{{ inner_prefix.strip('/') }}/VirtualHostRoot/{% if outer_prefix %}_vh_{% endif %}\2
+  http-request replace-path ^(/+VirtualHostBase/+[^/]+/+[^/]+)/+VirtualHostRoot/+{% if outer_prefix %}{{ outer_prefix }}($|/.*){% else %}(.*){% endif %} \1/{{ inner_prefix.strip('/') }}/VirtualHostRoot/{% if outer_prefix %}_vh_{{ outer_prefix.replace('/', '/_vh_') }}{% endif %}\2
 {%  endfor %}
 
 {%   set has_webdav = [] -%}