From 416921526d708562c3220713ee10e38e1c34c312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Thu, 10 Mar 2011 14:35:08 +0000
Subject: [PATCH] - use name in config and script generation
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44133 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py b/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
index ca3b4545bb..5a4ffcc9d7 100644
--- a/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
+++ b/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
@@ -353,11 +353,11 @@ class Recipe(BaseSlapRecipe):
address=url))
i += 1
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'),
config))
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,
self.wrapper_directory, arguments=[
self.options['haproxy_binary'].strip(), '-f', haproxy_conf_path]
--
2.30.9