[minion-cvs] Tweaks and fixes in response to integration tests.

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ServerConfig.py ServerMain.py 
Log Message:
Tweaks and fixes in response to integration tests.

ClientMain:
	- Give an actual URL and fingerprint for our (ersatz but operational) 
	  directory server.
	- Rename "servers" directory to "imported"; if we see any directories
	  named "servers" sitting around, gripe and try to remove them.
	- Check for expired or superseded descriptors on import.
	- Simplify "clean" logic a lot.
	- Fiddle with log messages and user-visible messages; add more warnings
	- Make the default path length configurable

ClientMain, Main:
	- Add 'import-server' command.

Common:
	- Only warn about fishy directory permissions once per directory.
	- Normalize paths before checking their permissions.
	- Use gzip a bit more pedantically.

test:
	- Remove a dead test

DirMain:
	- Use gzip a bit more pedantically.

ServerConfig, ServerMain:
	- Rename the confusing 'NoDaemon' option to 'Daemon' and flip its
	  semantics.

ServerConfig
	- Change the default MixAlgorithm from "Cottrell" to "Timed".




Index: ServerConfig.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerConfig.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ServerConfig.py	5 Jan 2003 01:30:20 -0000	1.8
+++ ServerConfig.py	5 Jan 2003 04:29:11 -0000	1.9
@@ -56,6 +56,10 @@
             raise ConfigError("PublicKeyLifetime must be at least 1 day.")
         if server['PublicKeySloppiness'][2] > 20*60:
             raise ConfigError("PublicKeySloppiness must be <= 20 minutes.")
+
+        if _haveEntry(entries, 'Server', 'NoDaemon'):
+            LOG.warn("The NoDaemon option is obsolete.  Use Daemon instead.")
+
         if _haveEntry(entries, 'Server', 'Mode'):
             LOG.warn("Mode specification is not yet supported.")
 
@@ -147,8 +151,10 @@
                      'LogFile' : ('ALLOW', None, None),
                      'LogLevel' : ('ALLOW', C._parseSeverity, "WARN"),
                      'EchoMessages' : ('ALLOW', C._parseBoolean, "no"),
-                     'NoDaemon' : ('ALLOW', C._parseBoolean, "no"),
-                     'EncryptIdentityKey' : ('REQUIRE', C._parseBoolean, "yes"),
+                     'Daemon' : ('ALLOW', C._parseBoolean, "no"),
+                     # Deprecated.
+                     'NoDaemon' : ('ALLOW', C._parseBoolean, None),
+                     'EncryptIdentityKey' :('REQUIRE', C._parseBoolean, "yes"),
                      'IdentityKeyBits': ('ALLOW', C._parseInt, "2048"),
                      'PublicKeyLifetime' : ('ALLOW', C._parseInterval,
                                             "30 days"),
@@ -161,7 +167,12 @@
                      'Comments': ('ALLOW', None, None),
                      'ModulePath': ('ALLOW', None, None),
                      'Module': ('ALLOW*', None, None),
-                     'MixAlgorithm' : ('ALLOW', _parseMixRule, "Cottrell"),
+                     
+##                      'MixAlgorithm' : ('ALLOW', _parseMixRule, "Cottrell"),
+##                      'MixInterval' : ('ALLOW', C._parseInterval, "30 min"),
+##                      'MixPoolRate' : ('ALLOW', _parseFraction, "60%"),
+##                      'MixPoolMinSize' : ('ALLOW', C._parseInt, "5"),
+                     'MixAlgorithm' : ('ALLOW', _parseMixRule, "Timed"),
                      'MixInterval' : ('ALLOW', C._parseInterval, "30 min"),
                      'MixPoolRate' : ('ALLOW', _parseFraction, "60%"),
                      'MixPoolMinSize' : ('ALLOW', C._parseInt, "5"),

Index: ServerMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerMain.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ServerMain.py	5 Jan 2003 01:30:20 -0000	1.14
+++ ServerMain.py	5 Jan 2003 04:29:11 -0000	1.15
@@ -452,7 +452,7 @@
         print >>sys.stderr, "Shutting down because of exception: %s"%info[1]
         sys.exit(1)
 
-    if not config['Server'].get("NoDaemon",0):
+    if config['Server'].get("Daemon",1):
         print >>sys.stderr, "Starting server in the background"
         daemonize()