Commit a609be64 authored by Julien Muchembled's avatar Julien Muchembled

version up: slapos.cookbook 1.0.139

parent c450768b
...@@ -77,9 +77,6 @@ class Recipe(GenericBaseRecipe): ...@@ -77,9 +77,6 @@ class Recipe(GenericBaseRecipe):
wait_files = options.get('wait-for-files') wait_files = options.get('wait-for-files')
pidfile = options.get('pidfile') pidfile = options.get('pidfile')
private_tmpfs = self.parsePrivateTmpfs() 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 = {} environment = {}
for line in (options.get('environment') or '').splitlines(): for line in (options.get('environment') or '').splitlines():
......
...@@ -86,7 +86,7 @@ md5sum = 0648e38bd5d3a15bb9f93264932740b9 ...@@ -86,7 +86,7 @@ md5sum = 0648e38bd5d3a15bb9f93264932740b9
[template-zope] [template-zope]
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = 8b4a15dca7e30ba5a792f1a9622216b0 md5sum = e9032f39c6e5db684342491fdeb4624c
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
......
...@@ -189,7 +189,10 @@ wrapped-command-line = '{{ bin_directory }}/runwsgi' {% if webdav %}-w{% endif % ...@@ -189,7 +189,10 @@ wrapped-command-line = '{{ bin_directory }}/runwsgi' {% if webdav %}-w{% endif %
{% else -%} {% else -%}
wrapped-command-line = '{{ bin_directory }}/runzope' -C '${:configuration-file}' wrapped-command-line = '{{ bin_directory }}/runzope' -C '${:configuration-file}'
{%- endif %} {%- 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') }}] [{{ section('zcml') }}]
recipe = slapos.cookbook:copyfilelist recipe = slapos.cookbook:copyfilelist
......
...@@ -137,7 +137,7 @@ pyparsing = 2.2.0 ...@@ -137,7 +137,7 @@ pyparsing = 2.2.0
pytz = 2016.10 pytz = 2016.10
requests = 2.13.0 requests = 2.13.0
six = 1.12.0 six = 1.12.0
slapos.cookbook = 1.0.138 slapos.cookbook = 1.0.139
slapos.core = 1.5.9 slapos.core = 1.5.9
slapos.extension.strip = 0.4 slapos.extension.strip = 0.4
slapos.extension.shared = 1.0 slapos.extension.shared = 1.0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment