[commits] r169 - selinux-site/trunk/buildout

[tim at mail.se.linux.org]

Author: tim
Date: 2008-03-03 18:42:51 +0100 (Mon, 03 Mar 2008)
New Revision: 169

Modified:
   selinux-site/trunk/buildout/production.cfg
Log:
Finish the work for a separate zodb for the portal_catalog. The catalog is used for getting out the most information from the database, so it's good if as much of portal_catalog is in memory as possible. Having portal_catalog in a separate database allows us to tune the cache parameters for the portal_catalog only and no other objects will compete for this cache.


Modified: selinux-site/trunk/buildout/production.cfg
===================================================================
--- selinux-site/trunk/buildout/production.cfg	2008-01-22 18:44:17 UTC (rev 168)
+++ selinux-site/trunk/buildout/production.cfg	2008-03-03 17:42:51 UTC (rev 169)
@@ -18,9 +18,9 @@
 recipe = plone.recipe.zope2zeoserver
 zope2-location = ${zope2:location}
 zeo-address = 8100
-zope-conf-additional =
+zeo-conf-additional =
   <filestorage 2>
-     path ${buildout:directory}/var/filestorage/CatalogData.fs
+     path ${buildout:directory}/var/filestorage/Catalog.fs
   </filestorage>
 
 [zopeclient1]
@@ -49,14 +49,12 @@
     ${buildout:directory}/parts/common-svn-products
 zope-conf-additional =
   <zodb_db catalog>
-    mount-point /plone.org/portal_catalog
+    mount-point /selinux/portal_catalog
     container-class Products.CMFPlone.CatalogTool.CatalogTool
     cache-size 10000
     <zeoclient>
       server ${zeoserver:zeo-address}
       storage 2
-      name catalogstorage
-      var ${buildout:directory}/parts/zopeclient1/var
       cache-size 400MB
     </zeoclient>
   </zodb_db>
@@ -76,19 +74,7 @@
 zcml = ${zopeclient1:zcml}
 effective-user = ${zopeclient1:effective-user}
 products = ${zopeclient1:products}
-zope-conf-additional =
-  <zodb_db catalog>
-    mount-point /plone.org/portal_catalog
-    container-class Products.CMFPlone.CatalogTool.CatalogTool
-    cache-size 10000
-    <zeoclient>
-      server ${zeoserver:zeo-address}
-      storage 2
-      name catalogstorage
-      var ${buildout:directory}/parts/zopeclient2/var
-      cache-size 400MB
-    </zeoclient>
-  </zodb_db>
+zope-conf-additional = ${zopeclient1:zope-conf-additional}
 
 [zopeclient3]
 recipe = plone.recipe.zope2instance
@@ -105,19 +91,7 @@
 zcml = ${zopeclient1:zcml}
 effective-user = ${zopeclient1:effective-user}
 products = ${zopeclient1:products}
-zope-conf-additional =
-  <zodb_db catalog>
-    mount-point /plone.org/portal_catalog
-    container-class Products.CMFPlone.CatalogTool.CatalogTool
-    cache-size 10000
-    <zeoclient>
-      server ${zeoserver:zeo-address}
-      storage 2
-      name catalogstorage
-      var ${buildout:directory}/parts/zopeclient3/var
-      cache-size 400MB
-    </zeoclient>
-  </zodb_db>
+zope-conf-additional = ${zopeclient1:zope-conf-additional}
 
 [zopeclient4]
 recipe = plone.recipe.zope2instance
@@ -134,19 +108,7 @@
 zcml = ${zopeclient1:zcml}
 effective-user = ${zopeclient1:effective-user}
 products = ${zopeclient1:products}
-zope-conf-additional =
-  <zodb_db catalog>
-    mount-point /plone.org/portal_catalog
-    container-class Products.CMFPlone.CatalogTool.CatalogTool
-    cache-size 10000
-    <zeoclient>
-      server ${zeoserver:zeo-address}
-      storage 2
-      name catalogstorage
-      var ${buildout:directory}/parts/zopeclient4/var
-      cache-size 400MB
-    </zeoclient>
-  </zodb_db>
+zope-conf-additional = ${zopeclient1:zope-conf-additional}
 
 [dist-products]
 recipe = plone.recipe.distros