Commit f2d7978f authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Merge branch 'erp5' into erp5-z2.13

parents 92260ac8 c04bdf35
No related merge requests found
...@@ -112,8 +112,8 @@ class Recipe(GenericBaseRecipe): ...@@ -112,8 +112,8 @@ class Recipe(GenericBaseRecipe):
self.options['conf-path'], self.options['conf-path'],
self.substituteTemplate( self.substituteTemplate(
self.getTemplateFilename('haproxy.cfg.in'), self.getTemplateFilename('haproxy.cfg.in'),
{'socket_path': self.options['socket-path']}, {'socket_path': self.options['socket-path'],
{'server_text': server_snippet}, 'server_text': server_snippet},
) )
) )
wrapper_path = self.createPythonScript( wrapper_path = self.createPythonScript(
......
...@@ -156,7 +156,7 @@ class GenericBaseRecipe(object): ...@@ -156,7 +156,7 @@ class GenericBaseRecipe(object):
if parameters_extra: if parameters_extra:
# pass-through further parameters # pass-through further parameters
lines[-1] += ' \\' lines[-1] += ' \\'
lines.append('\t$@') lines.append('\t"$@"')
content = '\n'.join(lines) + '\n' content = '\n'.join(lines) + '\n'
return self.createFile(name, content, 0700) return self.createFile(name, content, 0700)
......
...@@ -35,7 +35,7 @@ class Recipe(GenericBaseRecipe): ...@@ -35,7 +35,7 @@ class Recipe(GenericBaseRecipe):
wrapper_path = self.options['wrapper-path'] wrapper_path = self.options['wrapper-path']
wait_files = self.options.get('wait-for-files') wait_files = self.options.get('wait-for-files')
environment = self.options.get('environment') environment = self.options.get('environment')
parameters_extra = self.options.get('parameters_extra') parameters_extra = self.options.get('parameters-extra')
if not wait_files and not environment: if not wait_files and not environment:
# Create a simple wrapper as shell script # Create a simple wrapper as shell script
......
...@@ -46,4 +46,4 @@ LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:locatio ...@@ -46,4 +46,4 @@ LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:locatio
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${phantomjs:location}/phantomjs-slapos command-line = ${phantomjs:location}/phantomjs-slapos
wrapper-path = $${directory:bin}/phantomjs wrapper-path = $${directory:bin}/phantomjs
parameters_extra = true parameters-extra = true
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