Merge branch 'master' of git://lair.fifthhorseman.net/~dkg/monkeysphere

[monkeysphere.git] / src / monkeysphere-host

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index a67715f3ae30fd60f92d9263c591ecc8082159ce..540a8ab1c0e3a531ef13abf72cc5afbf761c27fa 100755 (executable)
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -54,14 +54,15 @@ usage: $PGRM <subcommand> [options] [args]
 Monkeysphere host admin tool.
 
 subcommands:
- import-key (i) [NAME[:PORT]]        import existing ssh key to gpg
+ import-key (i) FILE NAME[:PORT]     import existing ssh key to gpg
  show-key (s)                        output all host key information
- set-expire (e) EXPIRE               set host key expiration
+ 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) FINGERPRINT         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
@@ -236,6 +237,12 @@ COMMAND="$1"
 shift
 
 case $COMMAND in
+    'import-key'|'i')
+       check_host_key
+       source "${MHSHAREDIR}/import_key"
+       import_key "$@"
+       ;;
+
     'show-key'|'show'|'s')
        check_host_no_key
        show_key
@@ -262,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"
@@ -283,12 +290,6 @@ case $COMMAND in
        publish_key
        ;;
 
-    'import-key'|'i')
-       check_host_key
-       source "${MHSHAREDIR}/import_key"
-       import_key "$@"
-       ;;
-
     'diagnostics'|'d')
        load_fingerprint
        source "${MHSHAREDIR}/diagnostics"