summaryrefslogtreecommitdiff
path: root/man/man8/monkeysphere-server.8
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-06-17 14:52:31 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-06-17 14:52:31 -0400
commit9c94e937fbe8beb56956365cac07d6eff45215cd (patch)
tree11d9060e75580752bd79adb353e0d706c513a830 /man/man8/monkeysphere-server.8
parent92c70306aa5f96c8dfa69f2c90dca58908e719f7 (diff)
parentac63e6d6a916e4b51a183e60d7aeae3c2568f3af (diff)
Merge commit 'jrollins/master'
Diffstat (limited to 'man/man8/monkeysphere-server.8')
-rw-r--r--man/man8/monkeysphere-server.811
1 files changed, 7 insertions, 4 deletions
diff --git a/man/man8/monkeysphere-server.8 b/man/man8/monkeysphere-server.8
index eafd6a8..5ca248a 100644
--- a/man/man8/monkeysphere-server.8
+++ b/man/man8/monkeysphere-server.8
@@ -24,8 +24,11 @@ be used for authentication and encryption of ssh connection.
.B update-users [USER]...
Update the admin-controlled authorized_keys files for user. For each
user specified, update the user's authorized_keys file in
-/var/cache/monkeysphere/USER. See `man monkeysphere' for more info.
-`k' may be used in place of `update-known_hosts'.
+/var/cache/monkeysphere/authorized_keys/USER. See `man monkeysphere'
+for more info. If the USER_CONTROLLED_AUTHORIZED_KEYS variable is
+set, then a user-controlled authorized_keys file (usually
+~USER/.ssh/authorized_keys) is added to the authorized_keys file. `k'
+may be used in place of `update-known_hosts'.
.TP
.B gen-key
Generate a gpg key for the host. `g' may be used in place of
@@ -66,8 +69,8 @@ Monkeysphere GNUPG home directory.
/etc/monkeysphere/authorized_user_ids/USER
Server maintained authorized_user_ids files for users.
.TP
-/var/cache/monkeysphere/USER
-User keys cache directories.
+/var/cache/monkeysphere/authorized_keys/USER
+User authorized_keys file.
.SH AUTHOR