diff options
| author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-17 23:13:31 -0500 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-17 23:13:31 -0500 |
| commit | c1924de73702d0f999a44bc63df9bee0d432636a (patch) | |
| tree | 0f3ef7031c6a30a30e2c6aefac204d9cd67a7e12 /man/man8/monkeysphere-authentication.8 | |
| parent | 79c139755848692f514080c470fcba3f48b77112 (diff) | |
fix ma so that the setup command is folded into the other commands, so
it's never needed to be run manually, and can therefore be supressed
in the usage/documentation. Also, add setup to the postinst script so
that it's setup on installation.
Also add pipefail to ma, and try to supress unnecessary gpg output,
and redirect other to log debug.
Diffstat (limited to 'man/man8/monkeysphere-authentication.8')
| -rw-r--r-- | man/man8/monkeysphere-authentication.8 | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/man/man8/monkeysphere-authentication.8 b/man/man8/monkeysphere-authentication.8 index 9b8baa9..4d453d3 100644 --- a/man/man8/monkeysphere-authentication.8 +++ b/man/man8/monkeysphere-authentication.8 @@ -21,13 +21,7 @@ authentication. .SH SUBCOMMANDS -\fBmonkeysphere-authentication\fP takes various subcommands. -.TP -.B setup -Setup the server for Monkeysphere user authentication. This command -is idempotent, which means it can be run multiple times to make sure -the setup is correct, without adversely affecting existing setups. -`s' may be used in place of `setup'. +\fBmonkeysphere-authentication\fP takes various subcommands: .TP .B update-users [ACCOUNT]... Rebuild the monkeysphere-controlled authorized_keys files. For each @@ -62,6 +56,21 @@ Instruct system to ignore user identity certifications made by KEYID. List key IDs trusted by the system to certify user identities. `c' may be used in place of `list-id-certifiers'. .TP +.B help +Output a brief usage summary. `h' or `?' may be used in place of +`help'. +.TP +.B version +show version number + +Other commands: +.TP +.B setup +Setup the server for Monkeysphere user authentication. This command +is idempotent and run automatically by the other commands, and should +therefore not usually need to be run manually. `s' may be used in +place of `setup'. +.TP .B diagnostics Review the state of the server with respect to authentication. `d' may be used in place of `diagnostics'. @@ -72,13 +81,6 @@ authentication "sphere" keyring. This takes a single argument (multiple gpg arguments need to be quoted). Use this command with caution, as modifying the authentication sphere keyring can affect ssh user authentication. -.TP -.B help -Output a brief usage summary. `h' or `?' may be used in place of -`help'. -.TP -.B version -show version number .SH SETUP USER AUTHENTICATION |