1 diff --git man/man8/monkeysphere-server.8 man/man8/monkeysphere-server.8
2 index f207e2c..29c7b6a 100644
3 --- man/man8/monkeysphere-server.8
4 +++ man/man8/monkeysphere-server.8
5 @@ -128,7 +128,7 @@ command to push the key to a keyserver. You must also modify the
6 sshd_config on the server to tell sshd where the new server host key
9 -HostKey /var/lib/monkeysphere/ssh_host_rsa_key
10 +HostKey /var/monkeysphere/ssh_host_rsa_key
12 In order for users logging into the system to be able to verify the
13 host via the monkeysphere, at least one person (e.g. a server admin)
14 @@ -170,7 +170,7 @@ users. You must also tell sshd to look at the monkeysphere-generated
15 authorized_keys file for user authentication by setting the following
18 -AuthorizedKeysFile /var/lib/monkeysphere/authorized_keys/%u
19 +AuthorizedKeysFile /var/monkeysphere/authorized_keys/%u
21 It is recommended to add "monkeysphere-server update-users" to a
22 system crontab, so that user keys are kept up-to-date, and key
23 @@ -209,17 +209,17 @@ System monkeysphere-server config file.
24 /etc/monkeysphere/monkeysphere.conf
25 System-wide monkeysphere config file.
27 -/var/lib/monkeysphere/authorized_keys/USER
28 +/var/monkeysphere/authorized_keys/USER
29 Monkeysphere-generated user authorized_keys files.
31 -/var/lib/monkeysphere/ssh_host_rsa_key
32 +/var/monkeysphere/ssh_host_rsa_key
33 Copy of the host's private key in ssh format, suitable for use by
36 -/var/lib/monkeysphere/gnupg-host
37 +/var/monkeysphere/gnupg-host
38 Monkeysphere host GNUPG home directory.
40 -/var/lib/monkeysphere/gnupg-authentication
41 +/var/monkeysphere/gnupg-authentication
42 Monkeysphere authentication GNUPG home directory.
45 diff --git src/monkeysphere-server src/monkeysphere-server
46 index e590f3c..f46e8bb 100755
47 --- src/monkeysphere-server
48 +++ src/monkeysphere-server
49 @@ -17,7 +17,7 @@ SHARE=${MONKEYSPHERE_SHARE:="/usr/share/monkeysphere"}
51 . "${SHARE}/common" || exit 1
53 -VARLIB="/var/lib/monkeysphere"
54 +VARLIB="/var/monkeysphere"
57 # UTC date in ISO 8601 format if needed
58 diff --git doc/getting-started-admin.mdwn doc/getting-started-admin.mdwn
59 index 6c8ad53..67fdda1 100644
60 --- doc/getting-started-admin.mdwn
61 +++ doc/getting-started-admin.mdwn
62 @@ -30,7 +30,7 @@ To use the newly-generated host key for ssh connections, put the
63 following line in `/etc/ssh/sshd_config` (be sure to remove references
66 - HostKey /var/lib/monkeysphere/ssh_host_rsa_key
67 + HostKey /var/monkeysphere/ssh_host_rsa_key
69 FIXME: should we just suggest symlinks in the filesystem here instead?
71 @@ -40,7 +40,7 @@ To enable users to use the monkeysphere to authenticate using the
72 OpenPGP web of trust, add this line to `/etc/ssh/sshd_config` (again,
73 making sure that no other AuthorizedKeysFile directive exists):
75 - AuthorizedKeysFile /var/lib/monkeysphere/authorized_keys/%u
76 + AuthorizedKeysFile /var/monkeysphere/authorized_keys/%u
78 And then read the section below about how to ensure these files are
79 maintained. You'll need to restart `sshd` to have your changes take