From 73a1dfd6e0281346bf8cd17d2e44414beb93ab9c Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Nowak?= Date: Thu, 9 Jun 2011 16:17:03 +0200 Subject: [PATCH] Remove Zope2 dependency. Instantiation shall depend on minimal tools, like system administrator would. --- setup.py | 1 - slapos/recipe/erp5/__init__.py | 11 ++++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index c1f18da..afaea27 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,6 @@ setup(name=name, include_package_data=True, install_requires=[ 'PyXML', # for full blown python interpreter - 'Zope2', # some recipes like to play with zope 'lxml', # for full blown python interpreter 'netaddr', # to manipulate on IP addresses 'setuptools', # namespaces diff --git a/slapos/recipe/erp5/__init__.py b/slapos/recipe/erp5/__init__.py index 9354155..ce50e91 100644 --- a/slapos/recipe/erp5/__init__.py +++ b/slapos/recipe/erp5/__init__.py @@ -34,8 +34,13 @@ import sys import zc.buildout import zc.recipe.egg import ConfigParser -from Zope2.utilities.mkzopeinstance import write_inituser +# based on Zope2.utilities.mkzopeinstance.write_inituser +def Zope2InitUser(path, username, password): + open(path, 'w').write('') + os.chmod(path, 0600) + open(path, "w").write('%s:{SHA}%s\n' % ( + username,binascii.b2a_base64(hashlib.sha1(password).digest())[:-1])) class Recipe(BaseSlapRecipe): def getTemplateFilename(self, template_name): @@ -455,7 +460,7 @@ class Recipe(BaseSlapRecipe): password = self.generatePassword() # XXX Unhardcoded me please user = 'zope' - write_inituser( + Zope2InitUser( os.path.join(self.erp5_directory, "inituser"), user, password) self._createDirectory(self.erp5_directory) @@ -637,7 +642,7 @@ class Recipe(BaseSlapRecipe): ) # configure default Zope2 zcml open(os.path.join(self.erp5_directory, 'etc', 'site.zcml'), 'w').write( - pkg_resources.resource_string('Zope2', 'utilities/skel/etc/site.zcml')) + pkg_resources.resource_string(__name__, 'template/site.zcml')) zope_config['zodb_configuration_string'] = zodb_configuration_string zope_config['instance'] = self.erp5_directory zope_config['event_log'] = os.path.join(self.log_directory, -- 2.1.4