[Checkins] SVN: grok/trunk/ Default location for Data.fs and logfiles of grok's sample application is

[Reinout van Rees]

Log message for revision 103030:
  Default location for Data.fs and logfiles of grok's sample application is
    now var/filestorage/ and var/log/ instead of parts/data/ and parts/log/.
  Using z3c.recipe.mkdir instead of abusing zc.recipe.filestorage for this.
  Removed unneeded creation of etc dir as that's already there in svn.

Changed:
  U   grok/trunk/CHANGES.txt
  U   grok/trunk/buildout.cfg
  U   grok/trunk/etc/zope.conf.in

-=-
Modified: grok/trunk/CHANGES.txt
===================================================================
--- grok/trunk/CHANGES.txt	2009-08-21 10:20:12 UTC (rev 103029)
+++ grok/trunk/CHANGES.txt	2009-08-21 10:49:46 UTC (rev 103030)
@@ -6,6 +6,9 @@
 
 See: :ref:`upgrade_notes_1.0b1` for special notes on upgrading to this release.
 
+* Default location for Data.fs and logfiles of grok's sample application is
+  now var/filestorage/ and var/log/ instead of parts/data/ and parts/log/.
+
 * Bumped grokcore.view version: the View class is now split into View (with a
   template) and CodeView (with just a render() method).
 

Modified: grok/trunk/buildout.cfg
===================================================================
--- grok/trunk/buildout.cfg	2009-08-21 10:20:12 UTC (rev 103029)
+++ grok/trunk/buildout.cfg	2009-08-21 10:49:46 UTC (rev 103030)
@@ -5,7 +5,7 @@
     docs
     interpreter
     grokwiki
-    data log etc 
+    mkdirs
     test
     test-all
     zpasswd
@@ -37,15 +37,12 @@
        PasteScript
        PasteDeploy
 
-[data]
-recipe = zc.recipe.filestorage
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
 
-[log]
-recipe = zc.recipe.filestorage
-
-[etc]
-recipe = zc.recipe.filestorage
-
 [test]
 recipe = zc.recipe.testrunner
 eggs = grok
@@ -75,6 +72,8 @@
 recipe = z3c.recipe.template
 input = etc/zope.conf.in
 output = ${buildout:parts-directory}/etc/zope.conf
+filestorage = ${buildout:directory}/var/filestorage
+logfiles = ${buildout:directory}/var/log
 
 [site_zcml]
 recipe = z3c.recipe.template

Modified: grok/trunk/etc/zope.conf.in
===================================================================
--- grok/trunk/etc/zope.conf.in	2009-08-21 10:20:12 UTC (rev 103029)
+++ grok/trunk/etc/zope.conf.in	2009-08-21 10:49:46 UTC (rev 103030)
@@ -4,7 +4,7 @@
 <zodb>
   # Standard Filestorage
   <filestorage>
-    path ${data:path}
+    path ${zope_conf:filestorage}
   </filestorage>
 
 # Uncomment this if you want to connect to a ZEO server instead:
@@ -24,7 +24,7 @@
   # filesystem path.
 
   <logfile>
-    path ${buildout:directory}/parts/log/z3.log
+    path ${zope_conf:logfiles}/z3.log
     formatter zope.exceptions.log.Formatter
   </logfile>