[Erp5-report] r45837 luke - in /erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5:...

[nobody at svn.erp5.org]

Author: luke
Date: Wed May  4 16:04:50 2011
New Revision: 45837

URL: http://svn.erp5.org?rev=45837&view=rev
Log:
Allow configuring Zope node with TIDStorage.

Added:
    erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/template/zope-tidstorage-snippet.conf.in
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=45837&r1=45836&r2=45837&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] Wed May  4 16:04:50 2011
@@ -607,7 +607,7 @@ class Recipe(BaseSlapRecipe):
     return dict(host=ip, port=port)
 
   def installZope(self, ip, port, name, zodb_configuration_string,
-      with_timerservice=False):
+      with_timerservice=False, tidstorage_config=None):
     # Create zope configuration file
     zope_config = dict(
         products=self.options['products'],
@@ -645,6 +645,11 @@ class Recipe(BaseSlapRecipe):
     if with_timerservice:
       zope_conf_content += self.substituteTemplate(
           self.getTemplateFilename('zope.conf.timerservice.in'), zope_config)
+    if tidstorage_config is not None:
+      zope_conf_content += self.substituteTemplate(
+          self.getTemplateFilename('zope-tidstorage-snippet.conf.in'),
+          tidstorage_config)
+
     zope_conf_path = self.createConfigurationFile("%s.conf" % name,
         zope_conf_content)
     self.path_list.append(zope_conf_path)

Added: erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/template/zope-tidstorage-snippet.conf.in
URL: http://svn.erp5.org/erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/template/zope-tidstorage-snippet.conf.in?rev=45837&view=auto
==============================================================================
--- erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/template/zope-tidstorage-snippet.conf.in (added)
+++ erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/template/zope-tidstorage-snippet.conf.in [utf8] Wed May  4 16:04:50 2011
@@ -0,0 +1,6 @@
+
+# TIDStorage connection
+<product-config TIDStorage>
+  backend-ip %(host)s
+  backend-port %(port)s
+</product-config>