Commit d66cf3cd authored by Łukasz Nowak's avatar Łukasz Nowak

Password have to be exposed during init, not install.

parent c815904d
...@@ -27,6 +27,9 @@ ...@@ -27,6 +27,9 @@
from slapos.recipe.librecipe import GenericBaseRecipe from slapos.recipe.librecipe import GenericBaseRecipe
class Recipe(GenericBaseRecipe): class Recipe(GenericBaseRecipe):
def _options(self, options):
options['deadlock-password'] = self.generatePassword()
def install(self): def install(self):
""" Install a single Zope instance without ZEO Server. """ Install a single Zope instance without ZEO Server.
""" """
...@@ -63,7 +66,6 @@ class Recipe(GenericBaseRecipe): ...@@ -63,7 +66,6 @@ class Recipe(GenericBaseRecipe):
zope_config['address'] = '%s:%s' % (self.options['ip'], self.options['port']) zope_config['address'] = '%s:%s' % (self.options['ip'], self.options['port'])
zope_wrapper_template_location = self.getTemplateFilename('zope.conf.in') zope_wrapper_template_location = self.getTemplateFilename('zope.conf.in')
self.options['deadlock-password'] = self.generatePassword()
zope_conf_content = self.substituteTemplate(zope_wrapper_template_location, zope_conf_content = self.substituteTemplate(zope_wrapper_template_location,
zope_config, dump_url=self.options['deadlock-path'], zope_config, dump_url=self.options['deadlock-path'],
secret=self.options['deadlock-password']) secret=self.options['deadlock-password'])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment