Merge branch 'erp5' into erp5-z2.13

slapos/recipe/apache_zope_backend/__init__.py

@@ -76,8 +76,7 @@ class Recipe(GenericBaseRecipe):
           'vhosts': ''.join(self.substituteTemplate(vhost_template_name, {
             'ip': ip,
             'port': port,
-            'backend': backend,
-            'backend-path': backend_path,
+            'backend': ('%s/%s' % (backend.rstrip('/'), backend_path.strip('/'))).rstrip('/'),
             'ssl_enable': ssl_enable,
           }) for (port, backend) in backend_list),
         },

slapos/recipe/apache_zope_backend/template/vhost.in

 Listen %(ip)s:%(port)s
 <VirtualHost *:%(port)s>
   %(ssl_enable)s
-  RewriteRule ^/(.*) %(backend)s%(backend-path)s/$1 [L,P]
+  RewriteRule ^/(.*) %(backend)s/$1 [L,P]
 </VirtualHost>