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

[Fred L. Drake, Jr.]

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

Modified Files:
      Tag: new-install-branch
	zope.conf.in 
Log Message:
Update several sections so they can be used as the default values.


=== Zope/skel/etc/zope.conf.in 1.1.2.5 => 1.1.2.6 ===
--- Zope/skel/etc/zope.conf.in:1.1.2.5	Fri Feb 14 01:05:24 2003
+++ Zope/skel/etc/zope.conf.in	Fri Feb 14 15:47:24 2003
@@ -2,12 +2,12 @@
 # Welcome to Zope 2.
 ###############################################################################
 #
-# This is the default Zope configuration file.  The default Zope configuration
-# file shows what the default configuration directives are, and show examples
-# for each directive.  To declare a directive, make sure that you add it
-# to a line that does not begin with '#'.
+# This is the Zope configuration file.  The Zope configuration file
+# shows what the default configuration directives are, and show
+# examples for each directive.  To declare a directive, make sure that
+# you add it to a line that does not begin with '#'.
 
-# ZConfig "defines" used for later bash-style textual substitution
+# ZConfig "defines" used for later textual substitution
 
 %define INSTANCE_HOME <<INSTANCE_HOME>>
 
@@ -600,29 +600,29 @@
 #
 # Default:
 #
-#     The access log will log to the file $CLIENT_HOME/Z2.log at level
-#     INFO, the event log will log to the file $CLIENT_HOME/event.log at
-#     level INFO, and the trace log will not be written anywhere.
+#     The access log will log to the file <isntancehome>/log/Z2.log at
+#     level INFO, the event log will log to the file
+#     <instancehome>/log/event.log at level INFO, and the trace log
+#     will not be written anywhere.
 #
 # Examples:
-#
-# <logger event>
-#   level WARN
-#   <custom-handler>
-#     constructor zLOG.LogHandlers.FileHandler(filename="${instance_home}/var/event.log", mode="a+")
-#     formatter logging.Formatter(fmt="%(message)s", datefmt=None)
-#     level WARN
-#   </custom-handler>
-# </logger>
-#
-# <logger access>
-#   level WARN
-#   <file-handler>
-#      file /home/chrism/logs/foobar.log
-#      format %(message)s
-#   </file-handler>
-# </logger>
-#
+
+<eventlog>
+  level all
+  <logfile>
+    path $INSTANCE_HOME/log/event.log
+    level warn
+  </logfile>
+</eventlog>
+
+<logger access>
+  level WARN
+  <logfile>
+    path $INSTANCE_HOME/log/Z2.log
+    format %(message)s
+  </logfile>
+</logger>
+
 # <logger trace>
 #   level WARN
 #   <syslog-handler>
@@ -655,14 +655,19 @@
 #
 #     An HTTP server starts on port 8080, an FTP server starts on port
 #     8021.
-#
-# Examples:
-#
+
 <http-server>
   # valid keys are "address" and "force-connection-close"
   address 8080
   # force-connection-close on
 </http-server>
+
+<ftp-server>
+  # valid key is "address"
+  address 8021
+</ftp-server>
+
+# Examples:
 #
 #  <webdav-source-server>
 #    # valid keys are "address" and "force-connection-close"
@@ -685,11 +690,6 @@
 #    # valid keys are "address"
 #    address 8099
 #  </monitor-server>
-#
-#  <ftp-server>
-#    # valid key is "address"
-#    address 8021
-#  </ftp-server>
 #
 #  <icp-server>
 #    # valid key is "address"