[Zope-Checkins] CVS: Zope/skel/etc - zope.conf.in:1.1.2.8

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope/skel/etc
In directory cvs.zope.org:/tmp/cvs-serv6963

Modified Files:
      Tag: new-install-branch
	zope.conf.in 
Log Message:
- shorten the names of things provided by the mkzopeinstance script
- spell the references to the names consistently


=== Zope/skel/etc/zope.conf.in 1.1.2.7 => 1.1.2.8 ===
--- Zope/skel/etc/zope.conf.in:1.1.2.7	Fri Feb 14 16:35:59 2003
+++ Zope/skel/etc/zope.conf.in	Thu Feb 20 14:51:39 2003
@@ -9,7 +9,8 @@
 
 # ZConfig "defines" used for later textual substitution
 
-%define INSTANCE_HOME <<INSTANCE_HOME>>
+%define INSTANCE <<INSTANCE_HOME>>
+%define ZOPE <<ZOPE_HOME>>
 
 # Directive: instancehome
 #
@@ -25,7 +26,7 @@
 #
 #    instancehome /home/chrism/projects/sessions
 
-instancehome ${instance_home}
+instancehome $INSTANCE
 
 # Directive: softwarehome
 #
@@ -69,7 +70,7 @@
 #
 # Influences: CLIENT_HOME environment variable
 #
-# Default: ${instance_home}/var
+# Default: $INSTANCE/var
 #
 # Example:
 #
@@ -610,7 +611,7 @@
 <eventlog>
   level all
   <logfile>
-    path $INSTANCE_HOME/log/event.log
+    path $INSTANCE/log/event.log
     level info
   </logfile>
 </eventlog>
@@ -618,7 +619,7 @@
 <logger access>
   level WARN
   <logfile>
-    path $INSTANCE_HOME/log/Z2.log
+    path $INSTANCE/log/Z2.log
     format %(message)s
   </logfile>
 </logger>
@@ -713,7 +714,7 @@
 #
 # <zodb>
 #    <filestorage>
-#      file-name ${instance_home}/var/Data.fs
+#      path $INSTANCE/var/Data.fs
 #    </filestorage>
 #    mount-point /
 #    cache-size                     5000