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

[nobody at svn.erp5.org]

Author: luke
Date: Thu Mar 10 17:25:44 2011
New Revision: 44150

URL: http://svn.erp5.org?rev=44150&view=rev
Log:
 - Zope user and password can be stored and resued from connection dict

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=44150&r1=44149&r2=44150&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 17:25:44 2011
@@ -319,9 +319,8 @@ class Recipe(BaseSlapRecipe):
     # Create init user
     password = self.generatePassword()
     write_inituser(os.path.join(self.erp5_directory, "inituser"),
-        CONFIG['zope_user'], password)
-    self.connection_dict.update(zope_user=CONFIG['zope_user'],
-        zope_password=password)
+        'zope', password)
+    self.connection_dict.update(zope_user='zope', zope_password=password)
 
     self._createDirectory(self.erp5_directory)
     for directory in (
@@ -337,7 +336,7 @@ class Recipe(BaseSlapRecipe):
       self._createDirectory(os.path.join(self.erp5_directory, directory))
     return []
 
-  def installERP5Site(self, mysql_connection_string, erp5_site_id='erp5',):
+  def installERP5Site(self, mysql_connection_string, erp5_site_id='erp5'):
     """ Create a script controlled by supervisor, which creates a erp5
     site on current available zope and mysql environment"""