[Erp5-report] r44146 rafael - /erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/

[nobody at svn.erp5.org]

Author: rafael
Date: Thu Mar 10 16:53:09 2011
New Revision: 44146

URL: http://svn.erp5.org?rev=44146&view=rev
Log:
Do not hardcoded erp5 site id.

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=44146&r1=44145&r2=44146&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 16:53:09 2011
@@ -125,8 +125,9 @@ class Recipe(BaseSlapRecipe):
 
     haproxy_login = self.installHaproxy(
           ip=self.getLocalIPv4Address(), port='15000', name='login',
-          url_list=login_list, server_check_path=
-          self.parameter_dict.get('server_check_path', '/erp5/getId'))
+          url_list=login_list,
+          server_check_path=self.parameter_dict.get('server_check_path', \
+                                   '/%s/getId' % CONFIG['erp5_site_id']))
     self.connection_dict.update(
         apache_login=self.installLoginApache(ip=self.getGlobalIPv6Address(),
           port=13000, backend=haproxy_login))