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
Yusei Tahara
slapos
Commits
877695b6
Commit
877695b6
authored
Mar 20, 2012
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow to configure promise path
parent
209e93d7
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
0 deletions
+23
-0
slapos/recipe/generic_zope/__init__.py
slapos/recipe/generic_zope/__init__.py
+7
-0
slapos/recipe/generic_zope/template/zope.conf.promise.in
slapos/recipe/generic_zope/template/zope.conf.promise.in
+5
-0
slapos/recipe/generic_zope_zeo_client/__init__.py
slapos/recipe/generic_zope_zeo_client/__init__.py
+6
-0
slapos/recipe/generic_zope_zeo_client/template/zope.conf.promise.in
...ipe/generic_zope_zeo_client/template/zope.conf.promise.in
+5
-0
No files found.
slapos/recipe/generic_zope/__init__.py
View file @
877695b6
...
@@ -128,6 +128,13 @@ class Recipe(GenericBaseRecipe):
...
@@ -128,6 +128,13 @@ class Recipe(GenericBaseRecipe):
zope_conf_content
=
self
.
substituteTemplate
(
zope_wrapper_template_location
,
zope_conf_content
=
self
.
substituteTemplate
(
zope_wrapper_template_location
,
zope_config
)
zope_config
)
if
(
'promise-path'
in
self
.
options
)
and
(
'site-id'
in
self
.
options
):
zope_conf_content
+=
self
.
substituteTemplate
(
self
.
getTemplateFilename
(
'zope.conf.promise.in'
),
{
'site-id'
:
self
.
options
[
'site-id'
],
'promise-path'
:
self
.
options
[
'promise-path'
],
})
zope_conf_path
=
self
.
createFile
(
self
.
options
[
'configuration-file'
],
zope_conf_content
)
zope_conf_path
=
self
.
createFile
(
self
.
options
[
'configuration-file'
],
zope_conf_content
)
path_list
.
append
(
zope_conf_path
)
path_list
.
append
(
zope_conf_path
)
# Create init script
# Create init script
...
...
slapos/recipe/generic_zope/template/zope.conf.promise.in
0 → 100644
View file @
877695b6
# ERP5 promise
<product-config /%(site-id)s>
promise_path %(promise-path)s
</product-config>
slapos/recipe/generic_zope_zeo_client/__init__.py
View file @
877695b6
...
@@ -163,6 +163,12 @@ class Recipe(GenericBaseRecipe):
...
@@ -163,6 +163,12 @@ class Recipe(GenericBaseRecipe):
'tidstorage-ip'
:
self
.
options
[
'tidstorage-ip'
],
'tidstorage-ip'
:
self
.
options
[
'tidstorage-ip'
],
'tidstorage-port'
:
self
.
options
[
'tidstorage-port'
],
'tidstorage-port'
:
self
.
options
[
'tidstorage-port'
],
})
})
if
(
'promise-path'
in
self
.
options
)
and
(
'site-id'
in
self
.
options
):
zope_conf_content
+=
self
.
substituteTemplate
(
self
.
getTemplateFilename
(
'zope.conf.promise.in'
),
{
'site-id'
:
self
.
options
[
'site-id'
],
'promise-path'
:
self
.
options
[
'promise-path'
],
})
zope_conf_path
=
self
.
createFile
(
self
.
options
[
'configuration-file'
],
zope_conf_content
)
zope_conf_path
=
self
.
createFile
(
self
.
options
[
'configuration-file'
],
zope_conf_content
)
path_list
.
append
(
zope_conf_path
)
path_list
.
append
(
zope_conf_path
)
...
...
slapos/recipe/generic_zope_zeo_client/template/zope.conf.promise.in
0 → 100644
View file @
877695b6
# ERP5 promise
<product-config /%(site-id)s>
promise_path %(promise-path)s
</product-config>
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