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
isaak yansane-sisk
slapos
Commits
aabd3f5f
Commit
aabd3f5f
authored
Jul 15, 2011
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small style changes
parent
40f3fd05
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
slapos/recipe/erp5/__init__.py
slapos/recipe/erp5/__init__.py
+10
-6
No files found.
slapos/recipe/erp5/__init__.py
View file @
aabd3f5f
...
@@ -84,6 +84,7 @@ class Recipe(BaseSlapRecipe):
...
@@ -84,6 +84,7 @@ class Recipe(BaseSlapRecipe):
apache_login
=
self
.
installBackendApache
(
ip
=
self
.
getGlobalIPv6Address
(),
apache_login
=
self
.
installBackendApache
(
ip
=
self
.
getGlobalIPv6Address
(),
port
=
13000
,
backend
=
site_access
,
key
=
key
,
certificate
=
certificate
))
port
=
13000
,
backend
=
site_access
,
key
=
key
,
certificate
=
certificate
))
default_bt5_list
=
[]
default_bt5_list
=
[]
if
self
.
parameter_dict
.
get
(
"flavour"
,
"default"
)
==
'configurator'
:
if
self
.
parameter_dict
.
get
(
"flavour"
,
"default"
)
==
'configurator'
:
default_bt5_list
=
self
.
options
.
get
(
"configurator_bt5_list"
,
''
).
split
()
default_bt5_list
=
self
.
options
.
get
(
"configurator_bt5_list"
,
''
).
split
()
...
@@ -899,7 +900,11 @@ class Recipe(BaseSlapRecipe):
...
@@ -899,7 +900,11 @@ class Recipe(BaseSlapRecipe):
rewrite_rule_template
=
\
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
"
"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__
,
'template/apache.zope.conf.path-protected.in'
)
%
dict
(
path
=
'/'
,
access_control_string
=
'none'
)
path
=
pkg_resources
.
resource_string
(
__name__
,
'template/apache.zope.conf.path-protected.in'
)
%
\
dict
(
path
=
'/'
,
access_control_string
=
'none'
)
if
access_control_string
is
None
:
if
access_control_string
is
None
:
path_template
=
pkg_resources
.
resource_string
(
__name__
,
path_template
=
pkg_resources
.
resource_string
(
__name__
,
'template/apache.zope.conf.path.in'
)
'template/apache.zope.conf.path.in'
)
...
@@ -915,8 +920,7 @@ class Recipe(BaseSlapRecipe):
...
@@ -915,8 +920,7 @@ class Recipe(BaseSlapRecipe):
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
rewrite_rule
=
rewrite_rule_template
%
d
apache_conf
.
update
(
**
dict
(
apache_conf
.
update
(
**
dict
(
path_enable
=
path
,
path_enable
=
path
,
...
...
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