Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jean-Paul Smets
slapos
Commits
e3ac04c9
Commit
e3ac04c9
authored
Jul 04, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apache Virtual Host: Change into apache_zope_backend rewrite rules
Change RewrtireRule in order to generate https url.
parent
939b057e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
slapos/recipe/apache_zope_backend/template/vhost.in
slapos/recipe/apache_zope_backend/template/vhost.in
+1
-1
slapos/recipe/erp5_bootstrap/template/erp5_bootstrap.in
slapos/recipe/erp5_bootstrap/template/erp5_bootstrap.in
+2
-2
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-1
stack/erp5/instance-scalability.cfg.in
stack/erp5/instance-scalability.cfg.in
+1
-1
No files found.
slapos/recipe/apache_zope_backend/template/vhost.in
View file @
e3ac04c9
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>
slapos/recipe/erp5_bootstrap/template/erp5_bootstrap.in
View file @
e3ac04c9
...
@@ -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(
...
...
stack/erp5/buildout.cfg
View file @
e3ac04c9
...
@@ -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 = 7
61ff41d4f79cba89034a18aaf29ab27
md5sum = 7
0a35a1a923ed4b37c1fa1c93a178361
[template-zeo]
[template-zeo]
< = download-base
< = download-base
...
...
stack/erp5/instance-scalability.cfg.in
View file @
e3ac04c9
{% 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 =
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment