[Zope-Checkins] CVS: ZODB3/zdaemon - sample.conf:1.7 schema.xml:1.9 zdctl.py:1.30 zdoptions.py:1.11 zdrun.py:1.11

[Guido van Rossum]

Update of /cvs-repository/ZODB3/zdaemon
In directory cvs.zope.org:/tmp/cvs-serv24299/zdaemon

Modified Files:
	sample.conf schema.xml zdctl.py zdoptions.py zdrun.py 
Log Message:
Don't chdir into / by default; it's easier to write a tutorial if it
doesn't do this by default.


=== ZODB3/zdaemon/sample.conf 1.6 => 1.7 ===
--- ZODB3/zdaemon/sample.conf:1.6	Thu Jan 23 12:29:01 2003
+++ ZODB3/zdaemon/sample.conf	Fri Jan 24 08:04:08 2003
@@ -10,7 +10,7 @@
   socket-name	zdsock
   exit-codes	0,2
   # user has no default
-  directory	/
+  directory	.
   default-to-interactive True
   hang-around   False
 </runner>


=== ZODB3/zdaemon/schema.xml 1.8 => 1.9 ===
--- ZODB3/zdaemon/schema.xml:1.8	Thu Jan 23 15:33:37 2003
+++ ZODB3/zdaemon/schema.xml	Fri Jan 24 08:04:08 2003
@@ -17,7 +17,7 @@
     <key name="exit-codes" datatype="zdaemon.zdoptions.list_of_ints"
 	       default="0,2" />
     <key name="user" datatype="string" />
-    <key name="directory" datatype="existing-directory" default="/" />
+    <key name="directory" datatype="existing-directory" required="no" />
     <key name="default-to-interactive" datatype="boolean" default="true" />
     <key name="hang-around" datatype="boolean" default="false" />
     <key name="logfile" datatype="existing-dirpath" />


=== ZODB3/zdaemon/zdctl.py 1.29 => 1.30 ===
--- ZODB3/zdaemon/zdctl.py:1.29	Thu Jan 23 21:44:29 2003
+++ ZODB3/zdaemon/zdctl.py	Fri Jan 24 08:04:08 2003
@@ -30,7 +30,7 @@
 -s/--socket-name SOCKET -- Unix socket name for client (default "zdsock")
 -u/--user USER -- run as this user (or numeric uid)
 -x/--exit-codes LIST -- list of fatal exit codes (default "0,2")
--z/--directory DIRECTORY -- directory to chdir to when using -d (default "/")
+-z/--directory DIRECTORY -- directory to chdir to when using -d (default off)
 action [arguments] -- see below
 
 Actions are commands like "start", "stop" and "status".  If -i is


=== ZODB3/zdaemon/zdoptions.py 1.10 => 1.11 ===
--- ZODB3/zdaemon/zdoptions.py:1.10	Thu Jan 23 12:29:01 2003
+++ ZODB3/zdaemon/zdoptions.py	Fri Jan 24 08:04:08 2003
@@ -288,7 +288,7 @@
                  list_of_ints, default=[0, 2])
         self.add("user", "runner.user", "u:", "user=")
         self.add("directory", "runner.directory", "z:", "directory=",
-                 ZConfig.datatypes.existing_directory, default="/")
+                 ZConfig.datatypes.existing_directory)
         self.add("hang_around", "runner.hang_around")
 
 


=== ZODB3/zdaemon/zdrun.py 1.10 => 1.11 ===
--- ZODB3/zdaemon/zdrun.py:1.10	Thu Jan 23 16:24:39 2003
+++ ZODB3/zdaemon/zdrun.py	Fri Jan 24 08:04:08 2003
@@ -25,7 +25,7 @@
 -s/--socket-name SOCKET -- Unix socket name for client (default "zdsock")
 -u/--user USER -- run as this user (or numeric uid)
 -x/--exit-codes LIST -- list of fatal exit codes (default "0,2")
--z/--directory DIRECTORY -- directory to chdir to when using -d (default "/")
+-z/--directory DIRECTORY -- directory to chdir to when using -d (default off)
 program [program-arguments] -- an arbitrary application to run
 
 This daemon manager has two purposes: it restarts the application when