summaryrefslogtreecommitdiff
path: root/man/man8
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-19 12:29:47 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-19 12:29:47 -0500
commitc073811aa573d0e3486c39ed9514c46e0a7a077f (patch)
treecde598b94365bbe697d85ac6ca418cb94f2b4d26 /man/man8
parent930822a6e672c28c06f78e9d8250cda07248f129 (diff)
modify import_key to take the key file to import as an argument. can be '-' to import from stdin. modify man page and test accordingly.
Diffstat (limited to 'man/man8')
-rw-r--r--man/man8/monkeysphere-host.813
1 files changed, 7 insertions, 6 deletions
diff --git a/man/man8/monkeysphere-host.8 b/man/man8/monkeysphere-host.8
index 6c97315..f33aea6 100644
--- a/man/man8/monkeysphere-host.8
+++ b/man/man8/monkeysphere-host.8
@@ -23,9 +23,10 @@ connection authentication.
\fBmonkeysphere-host\fP takes various subcommands:
.TP
-.B import-key [NAME[:PORT]]
-Import a pem-encoded ssh secret host key, from stdin. NAME[:PORT] is
-used to specify the hostname (and port) used in the user ID of the new
+.B import-key FILE [NAME[:PORT]]
+Import a pem-encoded ssh secret host key from file FILE. If FILE
+is '-', then the key will be imported from stdin. NAME[:PORT] is used
+to specify the hostname (and port) used in the user ID of the new
OpenPGP key. If NAME is not specified, then the system
fully-qualified domain name will be used (ie. `hostname -f'). If PORT
is not specified, the no port is added to the user ID, which means
@@ -35,11 +36,11 @@ port 22 is assumed. `i' may be used in place of `import-key'.
Output information about host's OpenPGP and SSH keys. `s' may be used
in place of `show-key'.
.TP
-.B extend-key EXPIRE
+.B extend-key [EXPIRE]
Extend the validity of the OpenPGP key for the host until EXPIRE from
the present. If EXPIRE is not specified, then the user will be
-prompted for the extension term. Expiration is specified like GnuPG
-does:
+prompted for the extension term. Expiration is specified as with
+GnuPG:
.nf
0 = key does not expire
<n> = key expires in n days