Commit ba3b5d83 authored by Łukasz Nowak's avatar Łukasz Nowak

Use execute from librecipe.

parent 31483f38
...@@ -102,7 +102,7 @@ class Recipe(BaseSlapRecipe): ...@@ -102,7 +102,7 @@ class Recipe(BaseSlapRecipe):
self.path_list.append(config_file) self.path_list.append(config_file)
# Use execute from erp5. # Use execute from erp5.
self.path_list.extend(zc.buildout.easy_install.scripts([(name, self.path_list.extend(zc.buildout.easy_install.scripts([(name,
__name__ + 'slapos.recipe.erp5.execute', __name__ + 'slapos.recipe.librecipe.execute',
'execute_with_signal_translation')], self.ws, 'execute_with_signal_translation')], self.ws,
sys.executable, self.wrapper_directory, sys.executable, self.wrapper_directory,
arguments=[self.options['ooo_paster'].strip(), 'serve', config_file])) arguments=[self.options['ooo_paster'].strip(), 'serve', config_file]))
......
...@@ -96,7 +96,7 @@ class Recipe(BaseSlapRecipe): ...@@ -96,7 +96,7 @@ class Recipe(BaseSlapRecipe):
self._createDirectory(crontabs) self._createDirectory(crontabs)
# Use execute from erp5. # Use execute from erp5.
wrapper = zc.buildout.easy_install.scripts([('crond', wrapper = zc.buildout.easy_install.scripts([('crond',
'slapos.recipe.erp5.execute', 'execute')], self.ws, sys.executable, 'slapos.recipe.librecipe.execute', 'execute')], self.ws, sys.executable,
self.wrapper_directory, arguments=[ self.wrapper_directory, arguments=[
self.options['dcrond_binary'].strip(), '-s', cron_d, '-c', crontabs, self.options['dcrond_binary'].strip(), '-s', cron_d, '-c', crontabs,
'-t', timestamps, '-f', '-l', '5', '-M', catcher] '-t', timestamps, '-f', '-l', '5', '-M', catcher]
...@@ -220,7 +220,7 @@ class Recipe(BaseSlapRecipe): ...@@ -220,7 +220,7 @@ class Recipe(BaseSlapRecipe):
self.substituteTemplate(template_filename, self.substituteTemplate(template_filename,
stunnel_conf)) stunnel_conf))
wrapper = zc.buildout.easy_install.scripts([('stunnel', wrapper = zc.buildout.easy_install.scripts([('stunnel',
'slapos.recipe.erp5.execute', 'execute')], self.ws, sys.executable, 'slapos.recipe.librecipe.execute', 'execute')], self.ws, sys.executable,
self.wrapper_directory, arguments=[ self.wrapper_directory, arguments=[
self.options['stunnel_binary'].strip(), stunnel_conf_path] self.options['stunnel_binary'].strip(), stunnel_conf_path]
)[0] )[0]
......
...@@ -96,7 +96,7 @@ class Recipe(BaseSlapRecipe): ...@@ -96,7 +96,7 @@ class Recipe(BaseSlapRecipe):
self._createDirectory(crontabs) self._createDirectory(crontabs)
# Use execute from erp5. # Use execute from erp5.
wrapper = zc.buildout.easy_install.scripts([('crond', wrapper = zc.buildout.easy_install.scripts([('crond',
'slapos.recipe.erp5.execute', 'execute')], self.ws, sys.executable, 'slapos.recipe.librecipe.execute', 'execute')], self.ws, sys.executable,
self.wrapper_directory, arguments=[ self.wrapper_directory, arguments=[
self.options['dcrond_binary'].strip(), '-s', cron_d, '-c', crontabs, self.options['dcrond_binary'].strip(), '-s', cron_d, '-c', crontabs,
'-t', timestamps, '-f', '-l', '5', '-M', catcher] '-t', timestamps, '-f', '-l', '5', '-M', catcher]
...@@ -220,7 +220,7 @@ class Recipe(BaseSlapRecipe): ...@@ -220,7 +220,7 @@ class Recipe(BaseSlapRecipe):
self.substituteTemplate(template_filename, self.substituteTemplate(template_filename,
stunnel_conf)) stunnel_conf))
wrapper = zc.buildout.easy_install.scripts([('stunnel', wrapper = zc.buildout.easy_install.scripts([('stunnel',
'slapos.recipe.erp5.execute', 'execute')], self.ws, sys.executable, 'slapos.recipe.librecipe.execute', 'execute')], self.ws, sys.executable,
self.wrapper_directory, arguments=[ self.wrapper_directory, arguments=[
self.options['stunnel_binary'].strip(), stunnel_conf_path] self.options['stunnel_binary'].strip(), stunnel_conf_path]
)[0] )[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