Commit e3ac04c9 authored by Benjamin Blanc's avatar Benjamin Blanc

Apache Virtual Host: Change into apache_zope_backend rewrite rules

Change RewrtireRule in order to generate https url.
parent 939b057e
Listen %(ip)s:%(port)s Listen %(ip)s:%(port)s
<VirtualHost *:%(port)s> <VirtualHost *:%(port)s>
%(ssl_enable)s %(ssl_enable)s
RewriteRule (.*) %(backend)s%(backend-path)s$1 [L,P] RewriteRule (.*) %(backend)s%(backend-path)s//VirtualHostBase/https/%(ip)s:%(port)s/VirtualHostRoot/$1 [L,P]
</VirtualHost> </VirtualHost>
...@@ -20,7 +20,7 @@ if protocol == 'https': ...@@ -20,7 +20,7 @@ if protocol == 'https':
elif protocol == 'http': elif protocol == 'http':
zope_connection = httplib.HTTPConnection(host) zope_connection = httplib.HTTPConnection(host)
else: else:
raise ValueError("Protocol '%s' is not implemented" %(protocol)) raise ValueError("Protocol not implemented")
# Check if an ERP5 site is already created, as ERP5 does support having # Check if an ERP5 site is already created, as ERP5 does support having
# 2 instances in the same zope, and this script should not destroy user data # 2 instances in the same zope, and this script should not destroy user data
...@@ -35,7 +35,7 @@ if result.status == 204: # and (result.read() == "False"): ...@@ -35,7 +35,7 @@ if result.status == 204: # and (result.read() == "False"):
elif protocol == 'http': elif protocol == 'http':
zope_connection = httplib.HTTPConnection(host) zope_connection = httplib.HTTPConnection(host)
else: else:
raise ValueError("Protocol '%s' is not implemented" %(protocol)) raise ValueError("Protocol pot implemented")
# Create the expected ERP5 instance # Create the expected ERP5 instance
zope_connection.request( zope_connection.request(
......
...@@ -329,7 +329,7 @@ md5sum = c745d794b28cae64feba527f894d7340 ...@@ -329,7 +329,7 @@ md5sum = c745d794b28cae64feba527f894d7340
[template-scalability] [template-scalability]
< = download-base < = download-base
filename = instance-scalability.cfg.in filename = instance-scalability.cfg.in
md5sum = 761ff41d4f79cba89034a18aaf29ab27 md5sum = 70a35a1a923ed4b37c1fa1c93a178361
[template-zeo] [template-zeo]
< = download-base < = download-base
......
{% if slap_software_type == software_type -%} {% if slap_software_type == software_type -%}
{% set site_id = slapparameter_dict.get('site-id', 'erp5') -%} {% set site_id = slapparameter_dict.get('cluster').get('site-id', 'erp5') -%}
{% set promise_path = slapparameter_dict.get('promise-path', 'erp5') -%} {% set promise_path = slapparameter_dict.get('promise-path', 'erp5') -%}
[buildout] [buildout]
extends = extends =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment