[zopeorg-checkins] CVS: NZO_SiteLayout/etc - zeo.conf.in:1.3

[Tres Seaver]

Update of /cvs-zopeorg/NZO_SiteLayout/etc
In directory cvs.zope.org:/tmp/cvs-serv23940/etc

Modified Files:
	zeo.conf.in 
Log Message:
 - Hack command line to put 'default' storage in var/ZEOStorage.

=== NZO_SiteLayout/etc/zeo.conf.in 1.2 => 1.3 ===
 #   Where are instance-specific files / packages?
 #
-#env[ 'INSTANCE_HOME'    ] = pjoin( BASE_DIR, 'var', 'zope' )
-
-env[ 'STORAGE_HOME' ] = pjoin( BASE_DIR, 'var', 'ZEOStorage' )
+env[ 'INSTANCE_HOME'    ] = pjoin( BASE_DIR, 'var', 'ZEOStorage' )
 
 #   Where are appserver-process-specific files / packages?
 #
@@ -95,7 +93,7 @@
 
 #   Write appserver PIDfile where?
 #       ZEO_SERVER_PID env var, default INSTANCE_HOME/var/ZEO_SERVER.pid
-opts[ 'storage_server_pid'  ] = pjoin( env[ 'STORAGE_HOME' ]
+opts[ 'storage_server_pid'  ] = pjoin( env[ 'INSTANCE_HOME' ]
                                      , 'ZEO_SERVER.pid'
                                      )
 #------------------------------------------------------------------------------
@@ -104,7 +102,7 @@
 
 #   Write summary debug log where?
 #       STUPID_LOG_FILE env var, default BASE_DIR/var/zope/var/debug.log
-opts[ 'debug_logfile'  ] =  pjoin( env[ 'STORAGE_HOME' ], 'ZEO_SERVER.log' )
+opts[ 'debug_logfile'  ] =  pjoin( env[ 'INSTANCE_HOME' ], 'ZEO_SERVER.log' )
 
 #++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #   Storage options
@@ -116,6 +114,8 @@
 
 #   Mount a ZEO client storage as the root storage for the appserver.
 #
-storage[ ''             ] = ( 'ZODB.FileStorage'
-                            , pjoin( env[ 'STORAGE_HOME' ], 'Data.fs' )
+storage[ ''             ] = ( pjoin( env[ 'ZODB_HOME' ]
+                                   , 'ZODB/FileStorage.py'
+                                   )
+                            , pjoin( env[ 'INSTANCE_HOME' ], 'Data.fs' )
                             )