[minion-cvs] Make default BaseDir get set in only a single place; wa...

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion/server
In directory moria.mit.edu:/tmp/cvs-serv2892/lib/mixminion/server

Modified Files:
	ServerConfig.py 
Log Message:
Make default BaseDir get set in only a single place; warn on old /var/lib/minion default.

Index: ServerConfig.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerConfig.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- ServerConfig.py	3 Dec 2003 23:18:53 -0000	1.44
+++ ServerConfig.py	8 Dec 2003 02:26:39 -0000	1.45
@@ -204,6 +204,7 @@
         if v is None:
             v = self["Server"]["Homedir"]
         if v is None:
+            LOG.warn("Defaulting base directory to /var/spool/minion; this will change.")
             v = "/var/spool/minion"
         return v
 
@@ -307,10 +308,7 @@
         'Host' : mixminion.Config.ClientConfig._syntax['Host'],
         'Server' : { '__SECTION__' : ('REQUIRE', None, None),
                      'BaseDir' : ("ALLOW", "filename", None),
-                     'Homedir' :
-                         ('ALLOW', "filename", "/var/spool/minion"),
-                     # DOCDOC all these file options need documentation in
-                     # DOCDOC the example mixminiond.conf.
+                     'Homedir' : ('ALLOW', "filename", None),
                      'LogFile' : ('ALLOW', "filename", None),
                      'StatsFile' : ('ALLOW', "filename", None),
                      'KeyDir' : ('ALLOW', "filename", None),