[Erp5-report] r44133 luke - /erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/

[nobody at svn.erp5.org]

Author: luke
Date: Thu Mar 10 15:35:08 2011
New Revision: 44133

URL: http://svn.erp5.org?rev=44133&view=rev
Log:
 - use name in config and script generation

Modified:
    erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py

Modified: erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py?rev=44133&r1=44132&r2=44133&view=diff
==============================================================================
--- erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py [utf8] (original)
+++ erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py [utf8] Thu Mar 10 15:35:08 2011
@@ -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]