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

[Chris McDonough]

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

Modified Files:
	zeo.conf.in zope.conf.in 
Log Message:
Chekpoint.


=== NZO_SiteLayout/etc/zeo.conf.in 1.5 => 1.6 ===
 #   Listen for ZEO Clients on which ports? (can be tuple)
 #       -p, default = 8001
-opts[ 'zeo_port'       ] = 8001
+opts[ 'zeo_port'       ] = <<ZEO_SERVER_PORT>>
 
 
 #   Listen for ZEO Clients on which Unix domain socket?
@@ -75,7 +75,7 @@
 
 #   Run as which user?  (can be UID or username)
 #       -u, default None -> use current id
-opts[ 'run_as_user'     ] = None    # run as current user
+opts[ 'run_as_user'     ] = '<<RUNAS_USER>>'
 
 
 #------------------------------------------------------------------------------
@@ -102,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( <<LOGFILE_DIR>>, 'ZEO_SERVER.log' )
+opts[ 'debug_logfile'  ] =  pjoin( '<<ZEO_SERVER_LOGDIR>>', 'ZEO_SERVER.log' )
 
 #++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #   Storage options


=== NZO_SiteLayout/etc/zope.conf.in 1.2 => 1.3 ===
 #   Run as which user?  (can be UID or username)
 #       -u, default None -> use current id
-opts[ 'run_as_user'     ] = None    # run as current user
+opts[ 'run_as_user'     ] = '<<RUNAS_USER>>' or None
 
 #   Use which locale? (should be a locale ID)
 #       -L, default = use system default
@@ -148,7 +148,7 @@
 
 #   Mount a ZEO client storage as the root storage for the appserver.
 #
-storage[ 'main'         ] = ( '/', 'ZEO', 'localhost', '8001' )
+storage[ 'main'         ] = ( '/', 'ZEO', '<<ZEO_SERVER_HOST>>', '<<ZEO_SERVER_PORT>>' )
 
 #   Mount a temporary storage as '/temp_dir'.
 #