[minion-cvs] Rename foo-server to server-foo; retain old variants wi...

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	Main.py 
Log Message:
Rename foo-server to server-foo; retain old variants with a warning

Index: Main.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Main.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Main.py	17 Feb 2003 16:14:37 -0000	1.34
+++ Main.py	19 Feb 2003 03:41:22 -0000	1.35
@@ -130,8 +130,12 @@
     "inspect-pool" :   ( 'mixminion.ClientMain', 'listPool' ),
     "server" :         ( 'mixminion.server.ServerMain', 'runServer' ),
     "start-server" :   ( 'mixminion.server.ServerMain', 'runServer' ),
+    # obsolete; use server-stop #XXXX004 remove.
     "stop-server" :    ( 'mixminion.server.ServerMain', 'signalServer' ),
-    "reload-server" :  ( 'mixminion.server.ServerMain', 'signalServer' ),  
+    # obsolete; use server-reload #XXXX004 remove.
+    "reload-server" :  ( 'mixminion.server.ServerMain', 'signalServer' ),
+    "server-stop" :    ( 'mixminion.server.ServerMain', 'signalServer' ),
+    "server-reload" :  ( 'mixminion.server.ServerMain', 'signalServer' ),  
     "server-keygen" :  ( 'mixminion.server.ServerMain', 'runKeygen'),
     "server-DELKEYS" : ( 'mixminion.server.ServerMain', 'removeKeys'),
     "dir":             ( 'mixminion.directory.DirMain', 'main'),
@@ -154,8 +158,8 @@
   "       inspect-surbs  [Describe a single-use reply block]\n"+
   "                               (For Servers)\n"+
   "       server         [Begin running a Mixminion server]\n"+
-  "       stop-server    [Halt a running Mixminion server]\n"+
-  "       reload-server  [Make running Mixminion server reload its config\n"+
+  "       server-stop    [Halt a running Mixminion server]\n"+
+  "       server-reload  [Make running Mixminion server reload its config\n"+
   "                        (Not implemented yet; only restarts logging.)]\n"+
   "       server-keygen  [Generate keys for a Mixminion server]\n"+
   "       server-DELKEYS [Remove generated keys for a Mixminion server]\n"+