projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing typo in monkeysphere.1 (thanks, Suno Ano)
[monkeysphere.git]
/
man
/
man1
/
monkeysphere.1
diff --git
a/man/man1/monkeysphere.1
b/man/man1/monkeysphere.1
index 7cc4fe090085bf8c01f45837c109ac9c46893429..320cdfdc487a6b57233e0934c755d423a5a092e3 100644
(file)
--- a/
man/man1/monkeysphere.1
+++ b/
man/man1/monkeysphere.1
@@
-2,7
+2,7
@@
.SH NAME
.SH NAME
-monkeysphere
\
- Monkeysphere client user interface
+monkeysphere - Monkeysphere client user interface
.SH SYNOPSIS
.SH SYNOPSIS
@@
-42,8
+42,8
@@
were found but none were acceptable. `k' may be used in place of
.B update\-authorized_keys
Update the authorized_keys file for the user executing the command
(see MONKEYSPHERE_AUTHORIZED_KEYS in ENVIRONMENT, below). First all
.B update\-authorized_keys
Update the authorized_keys file for the user executing the command
(see MONKEYSPHERE_AUTHORIZED_KEYS in ENVIRONMENT, below). First all
-monkeysphere keys are cleared from the authorized_keys file. Then,
or
-each user ID in the user's authorized_user_ids file, gpg will be
+monkeysphere keys are cleared from the authorized_keys file. Then,
+
for
each user ID in the user's authorized_user_ids file, gpg will be
queried for keys associated with that user ID, optionally querying a
keyserver. If an acceptable key is found (see KEY ACCEPTABILITY in
.BR monkeysphere (7)),
queried for keys associated with that user ID, optionally querying a
keyserver. If an acceptable key is found (see KEY ACCEPTABILITY in
.BR monkeysphere (7)),
@@
-65,7
+65,7
@@
will be used. The length of the generated key can be specified with
the `\-\-length' or `\-l' option. `g' may be used in place of
`gen\-subkey'.
.TP
the `\-\-length' or `\-l' option. `g' may be used in place of
`gen\-subkey'.
.TP
-.B ssh\-proxycommand
+.B ssh\-proxycommand
[--no-connect] HOST [PORT]
An ssh ProxyCommand that can be used to trigger a monkeysphere update
of the ssh known_hosts file for a host that is being connected to with
ssh. This works by updating the known_hosts file for the host first,
An ssh ProxyCommand that can be used to trigger a monkeysphere update
of the ssh known_hosts file for a host that is being connected to with
ssh. This works by updating the known_hosts file for the host first,
@@
-121,7
+121,10
@@
to
.BR ssh\-add (1).
For example, to remove the authentication subkeys, pass an additional
`\-d' argument. To require confirmation on each use of the key, pass
.BR ssh\-add (1).
For example, to remove the authentication subkeys, pass an additional
`\-d' argument. To require confirmation on each use of the key, pass
-`\-c'. `s' may be used in place of `subkey\-to\-ssh\-agent'.
+`\-c'. The MONKEYSPHERE_SUBKEYS_FOR_AGENT environment can be used to
+specify the full fingerprints of specific keys to add to the agent
+(space separated), instead of adding them all. `s' may be used in
+place of `subkey\-to\-ssh\-agent'.
.TP
.B help
Output a brief usage summary. `h' or `?' may be used in place of
.TP
.B help
Output a brief usage summary. `h' or `?' may be used in place of
@@
-133,29
+136,33
@@
The following environment variables will override those specified in
the monkeysphere.conf configuration file (defaults in parentheses):
.TP
MONKEYSPHERE_LOG_LEVEL
the monkeysphere.conf configuration file (defaults in parentheses):
.TP
MONKEYSPHERE_LOG_LEVEL
-Set the log level
(INFO)
. Can be SILENT, ERROR, INFO, VERBOSE, DEBUG,
-in increasing order of verbosity.
+Set the log level. Can be SILENT, ERROR, INFO, VERBOSE, DEBUG,
+in increasing order of verbosity.
(INFO)
.TP
MONKEYSPHERE_GNUPGHOME, GNUPGHOME
.TP
MONKEYSPHERE_GNUPGHOME, GNUPGHOME
-GnuPG home directory
(~/.gnupg).
+GnuPG home directory
. (~/.gnupg)
.TP
MONKEYSPHERE_KEYSERVER
.TP
MONKEYSPHERE_KEYSERVER
-OpenPGP keyserver to use
(pool.sks-keyservers.net).
+OpenPGP keyserver to use
. (pool.sks-keyservers.net)
.TP
MONKEYSPHERE_CHECK_KEYSERVER
.TP
MONKEYSPHERE_CHECK_KEYSERVER
-Whether or not to check keyserver when making gpg queries
(true).
+Whether or not to check keyserver when making gpg queries
. (true)
.TP
MONKEYSPHERE_KNOWN_HOSTS
.TP
MONKEYSPHERE_KNOWN_HOSTS
-Path to ssh known_hosts file
(~/.ssh/known_hosts).
+Path to ssh known_hosts file
. (~/.ssh/known_hosts)
.TP
MONKEYSPHERE_HASH_KNOWN_HOSTS
.TP
MONKEYSPHERE_HASH_KNOWN_HOSTS
-Whether or not to hash to the known_hosts file entries
(true).
+Whether or not to hash to the known_hosts file entries
. (true)
.TP
MONKEYSPHERE_AUTHORIZED_KEYS
.TP
MONKEYSPHERE_AUTHORIZED_KEYS
-Path to ssh authorized_keys file
(~/.ssh/authorized_keys).
+Path to ssh authorized_keys file
. (~/.ssh/authorized_keys)
.TP
MONKEYSPHERE_PROMPT
.TP
MONKEYSPHERE_PROMPT
-If set to `false', never prompt the user for confirmation (true).
+If set to `false', never prompt the user for confirmation. (true)
+.TP
+MONKEYSPHERE_SUBKEYS_FOR_AGENT
+A space-separated list of authentication-capable subkeys to add to the
+ssh agent with subkey-to-ssh-agent.
.SH FILES
.SH FILES