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

- use name in config and script generation


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44133 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 8ea25e6d
...@@ -353,11 +353,11 @@ class Recipe(BaseSlapRecipe): ...@@ -353,11 +353,11 @@ class Recipe(BaseSlapRecipe):
address=url)) address=url))
i += 1 i += 1
config['server_text'] = '\n'.join(server_list) config['server_text'] = '\n'.join(server_list)
haproxy_conf_path = self.createConfigurationFile('haproxy.cfg', haproxy_conf_path = self.createConfigurationFile('haproxy_%s.cfg' % name,
self.substituteTemplate(self.getTemplateFilename('haproxy.cfg.in'), self.substituteTemplate(self.getTemplateFilename('haproxy.cfg.in'),
config)) config))
self.path_list.append(haproxy_conf_path) self.path_list.append(haproxy_conf_path)
wrapper = zc.buildout.easy_install.scripts([('haproxy', wrapper = zc.buildout.easy_install.scripts([('haproxy_%s' % name,
__name__ + '.execute', 'execute')], self.ws, sys.executable, __name__ + '.execute', 'execute')], self.ws, sys.executable,
self.wrapper_directory, arguments=[ self.wrapper_directory, arguments=[
self.options['haproxy_binary'].strip(), '-f', haproxy_conf_path] self.options['haproxy_binary'].strip(), '-f', haproxy_conf_path]
......
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