[zopeorg-checkins] CVS: NZO_SiteLayout/etc - zeo.conf.in:1.5 zope.conf.in:1.2

[Chris McDonough]

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

Modified Files:
	zeo.conf.in zope.conf.in 
Log Message:
Checkpoint checkin.


=== NZO_SiteLayout/etc/zeo.conf.in 1.4 => 1.5 ===
 #   Write summary debug log where?
 #       STUPID_LOG_FILE env var, default BASE_DIR/var/zope/var/debug.log
-opts[ 'debug_logfile'  ] =  pjoin( env[ 'INSTANCE_HOME' ], 'ZEO_SERVER.log' )
+opts[ 'debug_logfile'  ] =  pjoin( <<LOGFILE_DIR>>, 'ZEO_SERVER.log' )
 
 #++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #   Storage options


=== NZO_SiteLayout/etc/zope.conf.in 1.1.1.1 => 1.2 ===
 #   Where are instance-specific files / packages?
 #
-env[ 'INSTANCE_HOME'    ] = pjoin( BASE_DIR, 'var', 'zope' )
+env[ 'INSTANCE_HOME'    ] = pjoin( BASE_DIR, 'var', '<<INSTANCE_NAME>>' )
 
 #   Where are appserver-process-specific files / packages?
 #
@@ -47,19 +47,19 @@
 
 #   Listen for HTTP on which ports? (can be tuple)
 #       -w, default = 8080
-opts[ 'http_port'       ] = 8080
+opts[ 'http_port'       ] = <<INSTANCE_HTTP_PORT>>
 
 #   Listen for FTP on which ports? (can be tuple)
 #       -f, default = 8021
-opts[ 'ftp_port'        ] = 8021
+opts[ 'ftp_port'        ] = <<INSTANCE_FTP_PORT>>
 
 #   Listen for WebDAV source on which ports? (can be tuple)
 #       -W, default = disabled  (9800 is IANAN standard)
-opts[ 'webdav_port'     ] = 9800
+opts[ 'webdav_port'     ] = <<INSTANCE_DAV_PORT>>
 
 #   Listen for Monitor client on which ports? (can be tuple)
 #       -m, default = disabled
-opts[ 'monitor_port'    ] = None  # suppress
+opts[ 'monitor_port'    ] = <<INSTANCE_MONITOR_PORT>>
 
 
 #------------------------------------------------------------------------------
@@ -128,15 +128,15 @@
 
 #   Write access log where?
 #       -l, default BASE_DIR/var/zope/var/Z2.log
-opts[ 'access_logfile' ] =  pjoin( env[ 'INSTANCE_HOME' ], 'var', 'Z2.log' )
+opts[ 'access_logfile' ] =  pjoin( '<<INSTANCE_LOGDIR>>', 'Z2.log' )
 
 #   Write summary debug log where?
 #       STUPID_LOG_FILE env var, default BASE_DIR/var/zope/var/debug.log
-opts[ 'debug_logfile'  ] =  pjoin( env[ 'INSTANCE_HOME' ], 'var', 'debug.log' )
+opts[ 'debug_logfile'  ] =  pjoin( '<<INSTANCE_LOGDIR>>', 'debug.log' )
 
 #   Write detailed debug log where?
 #       -M, default disabled
-opts[ 'trace_logfile'  ] =  pjoin( env[ 'INSTANCE_HOME' ], 'var', 'trace.log' )
+opts[ 'trace_logfile'  ] =  pjoin( '<<INSTANCE_LOGDIR>>', 'detailed.log' )
 
 #++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #   Storage options
@@ -153,3 +153,4 @@
 #   Mount a temporary storage as '/temp_dir'.
 #
 storage[ 'temporary'    ] = ( '/temp_folder', 'Temporary' )
+