enforce error checking when transferring the authorized keys file. If the transfer...
[monkeysphere.git] / packaging / freebsd / files / patch-varlocation
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
7  is located:
8  
9 -HostKey /var/lib/monkeysphere/ssh_host_rsa_key
10 +HostKey /var/monkeysphere/ssh_host_rsa_key
11  
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
16  in the sshd_config:
17  
18 -AuthorizedKeysFile /var/lib/monkeysphere/authorized_keys/%u
19 +AuthorizedKeysFile /var/monkeysphere/authorized_keys/%u
20  
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.
26  .TP
27 -/var/lib/monkeysphere/authorized_keys/USER
28 +/var/monkeysphere/authorized_keys/USER
29  Monkeysphere-generated user authorized_keys files.
30  .TP
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
34  sshd.
35  .TP
36 -/var/lib/monkeysphere/gnupg-host
37 +/var/monkeysphere/gnupg-host
38  Monkeysphere host GNUPG home directory.
39  .TP
40 -/var/lib/monkeysphere/gnupg-authentication
41 +/var/monkeysphere/gnupg-authentication
42  Monkeysphere authentication GNUPG home directory.
43  
44  .SH AUTHOR
45 diff --git doc/getting-started-admin.mdwn doc/getting-started-admin.mdwn
46 index 6c8ad53..67fdda1 100644
47 --- doc/getting-started-admin.mdwn
48 +++ doc/getting-started-admin.mdwn
49 @@ -30,7 +30,7 @@ To use the newly-generated host key for ssh connections, put the
50  following line in `/etc/ssh/sshd_config` (be sure to remove references
51  to any other keys):
52  
53 -       HostKey /var/lib/monkeysphere/ssh_host_rsa_key
54 +       HostKey /var/monkeysphere/ssh_host_rsa_key
55  
56  FIXME: should we just suggest symlinks in the filesystem here instead?
57  
58 @@ -40,7 +40,7 @@ To enable users to use the monkeysphere to authenticate using the
59  OpenPGP web of trust, add this line to `/etc/ssh/sshd_config` (again,
60  making sure that no other AuthorizedKeysFile directive exists):
61  
62 -       AuthorizedKeysFile /var/lib/monkeysphere/authorized_keys/%u
63 +       AuthorizedKeysFile /var/monkeysphere/authorized_keys/%u
64  
65  And then read the section below about how to ensure these files are
66  maintained.  You'll need to restart `sshd` to have your changes take
67 --- src/monkeysphere-server.orig        2008-10-25 18:01:19.000000000 -0400
68 +++ src/monkeysphere-server     2008-10-25 18:01:24.000000000 -0400
69 @@ -17,7 +17,7 @@
70  export SYSSHAREDIR
71  . "${SYSSHAREDIR}/common" || exit 1
72  
73 -SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere"}
74 +SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/monkeysphere"}
75  export SYSDATADIR
76  
77  # UTC date in ISO 8601 format if needed
78 --- etc/gnupg-authentication.conf.orig  2008-10-25 18:02:58.000000000 -0400
79 +++ etc/gnupg-authentication.conf       2008-10-25 18:03:04.000000000 -0400
80 @@ -4,8 +4,8 @@
81  # It is highly recommended that you
82  #    DO NOT MODIFY
83  # these variables.
84 -primary-keyring /var/lib/monkeysphere/gnupg-authentication/pubring.gpg
85 -keyring /var/lib/monkeysphere/gnupg-host/pubring.gpg
86 +primary-keyring /var/monkeysphere/gnupg-authentication/pubring.gpg
87 +keyring /var/monkeysphere/gnupg-host/pubring.gpg
88  
89  # PGP keyserver to use for PGP queries.
90  keyserver hkp://pgp.mit.edu