monkeysphere-host revoke-key should now be capable of publishing the

[monkeysphere.git] / src / monkeysphere-host

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 4c7df88e31a72fdd18b63a8e59ee87d47e0ec4d9..efa48cdbf209b38b5417e64076374ad9170c2e33 100755 (executable)
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -56,12 +56,13 @@ Monkeysphere host admin tool.
 subcommands:
  import-key (i) FILE [NAME[:PORT]]   import existing ssh key to gpg
  show-key (s)                        output all host key information
+ publish-key (p)                     publish host key to keyserver
  set-expire (e) [EXPIRE]             set host key expiration
  add-hostname (n+) NAME[:PORT]       add hostname user ID to host key
  revoke-hostname (n-) NAME[:PORT]    revoke hostname user ID
- add-revoker (o) [KEYID|FILE]        add a revoker to the host key
- revoke-key (r)                      revoke host key
- publish-key (p)                     publish host key to keyserver
+ add-revoker (r+) [KEYID|FILE]        add a revoker to the host key
+ revoke-key                          generate and/or publish revocation
+                                     certificate for host key
 
  version (v)                         show version number
  help (h,?)                          this help
@@ -268,14 +269,14 @@ case $COMMAND in
        revoke_hostname "$@"
        ;;
 
-    'add-revoker'|'o')
+    'add-revoker'|'r+')
        check_host_no_key
        load_fingerprint
        source "${MHSHAREDIR}/add_revoker"
        add_revoker "$@"
        ;;
 
-    'revoke-key'|'r')
+    'revoke-key')
        check_host_no_key
        load_fingerprint
        source "${MHSHAREDIR}/revoke_key"