[Checkins] SVN: grokproject/trunk/ - The var/ directory is now used for var/filestorage, var/blobstorage and
Reinout van Rees
reinout at vanrees.org
Fri Aug 21 07:46:11 EDT 2009
Log message for revision 103032:
- The var/ directory is now used for var/filestorage, var/blobstorage and
var/log instead of storing all that in the parts/ directory. This matches
expectations of most users: parts/ can be rebuild, var/ must be backed up.
- Using z3c.recipe.mkdir instead of abusing the filestorage recipe.
- Added an 'extra' option to zope_conf for inserting productconfig sections
into the zope.conf file.
Changed:
U grokproject/trunk/CHANGES.txt
U grokproject/trunk/grokproject/template_paste/buildout.cfg_tmpl
U grokproject/trunk/grokproject/template_paste/etc/zope.conf.in_tmpl
U grokproject/trunk/tests_paste.txt
-=-
Modified: grokproject/trunk/CHANGES.txt
===================================================================
--- grokproject/trunk/CHANGES.txt 2009-08-21 11:24:12 UTC (rev 103031)
+++ grokproject/trunk/CHANGES.txt 2009-08-21 11:46:10 UTC (rev 103032)
@@ -4,6 +4,10 @@
1.0a5 (not released)
--------------------
+* The var/ directory is now used for var/filestorage, var/blobstorage and
+ var/log instead of storing all that in the parts/ directory. This matches
+ expectations of most users: parts/ can be rebuild, var/ must be backed up.
+
* Added blob-storage in paster template's `zope.conf.in`. Blob-storage
is enabled by default.
Modified: grokproject/trunk/grokproject/template_paste/buildout.cfg_tmpl
===================================================================
--- grokproject/trunk/grokproject/template_paste/buildout.cfg_tmpl 2009-08-21 11:24:12 UTC (rev 103031)
+++ grokproject/trunk/grokproject/template_paste/buildout.cfg_tmpl 2009-08-21 11:46:10 UTC (rev 103032)
@@ -1,7 +1,17 @@
[buildout]
develop = .
-parts = eggbasket app i18n test data log zpasswd
- zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+ eggbasket
+ app
+ i18n
+ test
+ mkdirs
+ zpasswd
+ zope_conf
+ site_zcml
+ zdaemon_conf
+ deploy_ini
+ debug_ini
newest = ${newest}
# Comment the following line in, if you need megrok.forms or other
@@ -27,13 +37,13 @@
PasteDeploy
interpreter = python-console
-# See etc/zope.conf.in if you want to enable a blob storage.
-[data]
-recipe = zc.recipe.filestorage
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+ $${zope_conf:filestorage}
+ $${zope_conf:logfiles}
+ $${zope_conf:blobstorage}
-[log]
-recipe = zc.recipe.filestorage
-
[test]
recipe = zc.recipe.testrunner
eggs = ${egg}
@@ -60,6 +70,11 @@
recipe = collective.recipe.template
input = etc/zope.conf.in
output = $${buildout:parts-directory}/etc/zope.conf
+filestorage = $${buildout:directory}/var/filestorage
+blobstorage = $${buildout:directory}/var/blobstorage
+logfiles = $${buildout:directory}/var/log
+extra =
+# 'extra' is copied verbatim. Use it for product config sections and so.
[site_zcml]
recipe = collective.recipe.template
Modified: grokproject/trunk/grokproject/template_paste/etc/zope.conf.in_tmpl
===================================================================
--- grokproject/trunk/grokproject/template_paste/etc/zope.conf.in_tmpl 2009-08-21 11:24:12 UTC (rev 103031)
+++ grokproject/trunk/grokproject/template_paste/etc/zope.conf.in_tmpl 2009-08-21 11:46:10 UTC (rev 103032)
@@ -4,15 +4,15 @@
<zodb>
# Standard blob storage
<blobstorage>
- blob-dir $${buildout:parts-directory}/blobs
+ blob-dir $${zope_conf:blobstorage}
<filestorage>
- path $${data:path}
+ path $${zope_conf:filestorage}
</filestorage>
</blobstorage>
# Uncomment this if you want a blob-less standard file storage instead:
# <filestorage>
-# path $${data:path}
+# path $${zope_conf:filestorage}
# </filestorage>
# Uncomment this if you want to connect to a ZEO server instead:
@@ -33,7 +33,7 @@
# filesystem path.
<logfile>
- path $${buildout:directory}/parts/log/z3.log
+ path $${zope_conf:logfiles}/z3.log
formatter zope.exceptions.log.Formatter
</logfile>
@@ -48,4 +48,8 @@
# Comment this line to disable developer mode. This should be done in
# production
-devmode on
\ No newline at end of file
+devmode on
+
+# Extra configuration lines can be added to zope_conf's extra option. Put for
+# instance productconf sections in here.
+$${zope_conf:extra}
Modified: grokproject/trunk/tests_paste.txt
===================================================================
--- grokproject/trunk/tests_paste.txt 2009-08-21 11:24:12 UTC (rev 103031)
+++ grokproject/trunk/tests_paste.txt 2009-08-21 11:46:10 UTC (rev 103032)
@@ -39,6 +39,7 @@
parts
setup.py
src
+ var
versions.cfg
>>> software_dir = os.path.join(package_dir, 'src', 'grokexample')
More information about the Checkins
mailing list