From 842f5a607c0caef2bda2f06b6abc8fdec9607614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Thu, 10 Mar 2011 16:25:44 +0000 Subject: [PATCH] - Zope user and password can be stored and resued from connection dict git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44150 20353a03-c40f-0410-a6d1-a30d3c3de9de --- slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py b/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py index 958feff0cf..f3e3ad518b 100644 --- a/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py +++ b/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py @@ -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""" -- 2.30.9