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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
slapos
Commits
a609be64
Commit
a609be64
authored
Mar 04, 2020
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
version up: slapos.cookbook 1.0.139
parent
c450768b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
slapos/recipe/wrapper.py
slapos/recipe/wrapper.py
+0
-3
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+1
-1
stack/erp5/instance-zope.cfg.in
stack/erp5/instance-zope.cfg.in
+4
-1
stack/slapos.cfg
stack/slapos.cfg
+1
-1
No files found.
slapos/recipe/wrapper.py
View file @
a609be64
...
...
@@ -77,9 +77,6 @@ class Recipe(GenericBaseRecipe):
wait_files
=
options
.
get
(
'wait-for-files'
)
pidfile
=
options
.
get
(
'pidfile'
)
private_tmpfs
=
self
.
parsePrivateTmpfs
()
private_dev_shm
=
options
.
get
(
'private-dev-shm'
)
# BBB
if
private_dev_shm
:
private_tmpfs
.
append
((
private_dev_shm
,
'/dev/shm'
))
environment
=
{}
for
line
in
(
options
.
get
(
'environment'
)
or
''
).
splitlines
():
...
...
stack/erp5/buildout.hash.cfg
View file @
a609be64
...
...
@@ -86,7 +86,7 @@ md5sum = 0648e38bd5d3a15bb9f93264932740b9
[template-zope]
filename = instance-zope.cfg.in
md5sum =
8b4a15dca7e30ba5a792f1a9622216b0
md5sum =
e9032f39c6e5db684342491fdeb4624c
[template-balancer]
filename = instance-balancer.cfg.in
...
...
stack/erp5/instance-zope.cfg.in
View file @
a609be64
...
...
@@ -189,7 +189,10 @@ wrapped-command-line = '{{ bin_directory }}/runwsgi' {% if webdav %}-w{% endif %
{% else -%}
wrapped-command-line = '{{ bin_directory }}/runzope' -C '${:configuration-file}'
{%- endif %}
private-dev-shm = {{ slapparameter_dict['private-dev-shm'] }}
{%- set private_dev_shm = slapparameter_dict['private-dev-shm'] %}
{%- if private_dev_shm %}
private-tmpfs = {{ private_dev_shm }} /dev/shm
{%- endif %}
[{{ section('zcml') }}]
recipe = slapos.cookbook:copyfilelist
...
...
stack/slapos.cfg
View file @
a609be64
...
...
@@ -137,7 +137,7 @@ pyparsing = 2.2.0
pytz = 2016.10
requests = 2.13.0
six = 1.12.0
slapos.cookbook = 1.0.13
8
slapos.cookbook = 1.0.13
9
slapos.core = 1.5.9
slapos.extension.strip = 0.4
slapos.extension.shared = 1.0
...
...
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