From 438d1fa8881a1f8359b5e91932bf42addefbffca Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 23 Jun 2008 19:02:58 -0400
Subject: switched shortcut for monkeysphere-server update-users to "u", added
some FIXMEs to monkeysphere-server.
---
man/man8/monkeysphere-server.8 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'man/man8')
diff --git a/man/man8/monkeysphere-server.8 b/man/man8/monkeysphere-server.8
index e821e63..f808eff 100644
--- a/man/man8/monkeysphere-server.8
+++ b/man/man8/monkeysphere-server.8
@@ -28,8 +28,8 @@ file are processed, and the user's authorized_keys file in
/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'.
+~USER/.ssh/authorized_keys) is added to the authorized_keys file. `u'
+may be used in place of `update-users.
.TP
.B gen-key
Generate a gpg key for the host. `g' may be used in place of
--
cgit v1.2.3
From 2a8ee05beeb4d81e58cf6e9af9e1b1abfa5c1709 Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Tue, 24 Jun 2008 00:56:19 -0400
Subject: Fix man pages to reflect recent path changes.
---
man/man8/monkeysphere-server.8 | 21 +++++++++++----------
src/monkeysphere-server | 4 ++--
2 files changed, 13 insertions(+), 12 deletions(-)
(limited to 'man/man8')
diff --git a/man/man8/monkeysphere-server.8 b/man/man8/monkeysphere-server.8
index f808eff..9bb7b2d 100644
--- a/man/man8/monkeysphere-server.8
+++ b/man/man8/monkeysphere-server.8
@@ -63,12 +63,12 @@ that is done, publish the key to a keyserver with "publish-key"
subcommand. Finally, you need to modify the sshd_config to tell sshd
where the new server host key:
-HostKey /etc/monkeysphere/ssh_host_rsa_key
+HostKey /var/lib/monkeysphere/ssh_host_rsa_key
If the server will also handle user authentication through
monkeysphere-generated authorized_keys files, set the following:
-AuthorizedKeysFile /var/cache/monkeysphere/authorized_keys/%u
+AuthorizedKeysFile /var/lib/monkeysphere/authorized_keys/%u
Once those changes are made, restart the ssh server.
@@ -81,17 +81,18 @@ System monkeysphere-server config file.
/etc/monkeysphere/monkeysphere.conf
System-wide monkeysphere config file.
.TP
-/etc/monkeysphere/gnupg
-Monkeysphere GNUPG home directory.
+/var/lib/monkeysphere/authorized_keys/USER
+Monkeysphere-generated user authorized_keys files.
.TP
-/etc/monkeysphere/ssh_host_rsa_key
-Copy of the host's private key in ssh format, suitable for use by sshd.
+/var/lib/monkeysphere/ssh_host_rsa_key
+Copy of the host's private key in ssh format, suitable for use by
+sshd.
.TP
-/etc/monkeysphere/authorized_user_ids/USER
-Server maintained authorized_user_ids files for users.
+/var/lib/monkeysphere/gnupg-host
+Monkeysphere host GNUPG home directory.
.TP
-/var/cache/monkeysphere/authorized_keys/USER
-User authorized_keys file.
+/var/lib/monkeysphere/gnupg-authentication
+Monkeysphere authentication GNUPG home directory.
.SH AUTHOR
diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index b711fc5..ac7c1cb 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -125,8 +125,8 @@ EOF
# write the key to the file
# NOTE: assumes that the primary key is the proper key to use
- (umask 077 && gpgsecret2ssh "$keyID" > "${MS_HOME}/ssh_host_rsa_key")
- log "Private SSH host key output to file: ${MS_HOME}/ssh_host_rsa_key"
+ (umask 077 && gpgsecret2ssh "$keyID" > "${VARLIB}/ssh_host_rsa_key")
+ log "Private SSH host key output to file: ${VARLIB}/ssh_host_rsa_key"
}
# gpg output key fingerprint
--
cgit v1.2.3