[minion-cvs] Commit configurability work for 0.0.5. (needs testing)

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ServerConfig.py 
Log Message:
Commit configurability work for 0.0.5.  (needs testing)

- Add ability to disable directory paranoia (disabled by default on
  cygwin, win32).
- Make directory paranoia messages more helpful.
- Change min,default,max public key overlap from (0,2,6) hours to (6,24,72) 
  hours.



Index: ServerConfig.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerConfig.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ServerConfig.py	5 Jun 2003 18:41:40 -0000	1.33
+++ ServerConfig.py	26 Jun 2003 17:43:27 -0000	1.34
@@ -57,8 +57,10 @@
             LOG.warn("Encrypted private keys not yet implemented")
         if server['PublicKeyLifetime'].getSeconds() < 24*60*60:
             raise ConfigError("PublicKeyLifetime must be at least 1 day.")
-        if server['PublicKeyOverlap'].getSeconds() > 6*60*60:
-            raise ConfigError("PublicKeyOverlap must be <= 6 hours")
+        if server['PublicKeyOverlap'].getSeconds() < 6*60*60:
+            raise ConfigError("PublicKeyOverlap must be >= 6 hours")
+        if server['PublicKeyOverlap'].getSeconds() > 72*60*60:
+            raise ConfigError("PublicKeyOverlap must be <= 72 hours")
 
         if _haveEntry(self, 'Server', 'Mode'):
             LOG.warn("Mode specification is not yet supported.")
@@ -246,7 +248,7 @@
                      'PublicKeyLifetime' : ('ALLOW', C._parseInterval,
                                             "30 days"),
                      'PublicKeyOverlap': ('ALLOW', C._parseInterval,
-                                          "5 minutes"),
+                                          "24 hours"),
                      'EncryptPrivateKey' : ('ALLOW', C._parseBoolean, "no"),
                      'Mode' : ('REQUIRE', C._parseServerMode, "local"),
                      'Nickname': ('REQUIRE', C._parseNickname, None),