Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
892f2055
Commit
892f2055
authored
Jul 28, 2011
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reorganize to improve readability.
parent
67c6efdf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
slapos/recipe/erp5/__init__.py
slapos/recipe/erp5/__init__.py
+6
-5
No files found.
slapos/recipe/erp5/__init__.py
View file @
892f2055
...
@@ -915,9 +915,6 @@ class Recipe(BaseSlapRecipe):
...
@@ -915,9 +915,6 @@ class Recipe(BaseSlapRecipe):
'template/apache.ssl-snippet.conf.in'
)
%
dict
(
'template/apache.ssl-snippet.conf.in'
)
%
dict
(
login_certificate
=
certificate
,
login_key
=
key
)
login_certificate
=
certificate
,
login_key
=
key
)
rewrite_rule_template
=
\
"RewriteRule ^%(path)s($|/.*) %(backend_url)s/VirtualHostBase/https/%(server_name)s:%(port)s%(backend_path)s/VirtualHostRoot/_vh_%(vhname)s$1 [L,P]
\
n
"
path
=
pkg_resources
.
resource_string
(
__name__
,
path
=
pkg_resources
.
resource_string
(
__name__
,
'template/apache.zope.conf.path-protected.in'
)
%
\
'template/apache.zope.conf.path-protected.in'
)
%
\
dict
(
path
=
'/'
,
access_control_string
=
'none'
)
dict
(
path
=
'/'
,
access_control_string
=
'none'
)
...
@@ -931,14 +928,18 @@ class Recipe(BaseSlapRecipe):
...
@@ -931,14 +928,18 @@ class Recipe(BaseSlapRecipe):
'template/apache.zope.conf.path-protected.in'
)
'template/apache.zope.conf.path-protected.in'
)
path
+=
path_template
%
dict
(
path
=
frontend_path
,
path
+=
path_template
%
dict
(
path
=
frontend_path
,
access_control_string
=
access_control_string
)
access_control_string
=
access_control_string
)
d
=
dict
(
rewrite_rule_template
=
\
"RewriteRule ^%(path)s($|/.*) %(backend_url)s/VirtualHostBase/https/%(server_name)s:%(port)s%(backend_path)s/VirtualHostRoot/%(vhname)s$1 [L,P]
\
n
"
rewrite_rule
=
rewrite_rule_template
%
dict
(
path
=
frontend_path
,
path
=
frontend_path
,
backend_url
=
backend_url
,
backend_url
=
backend_url
,
backend_path
=
backend_path
,
backend_path
=
backend_path
,
port
=
apache_conf
[
'port'
],
port
=
apache_conf
[
'port'
],
vhname
=
frontend_path
.
replace
(
'/'
,
''
),
vhname
=
frontend_path
.
replace
(
'/'
,
''
),
server_name
=
name
)
server_name
=
name
)
rewrite_rule
=
rewrite_rule_template
%
d
apache_conf
.
update
(
**
dict
(
apache_conf
.
update
(
**
dict
(
path_enable
=
path
,
path_enable
=
path
,
rewrite_rule
=
rewrite_rule
rewrite_rule
=
rewrite_rule
...
...
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