Merge commit 'jrollins/master'
[monkeysphere.git] / packaging / freebsd / files / patch-etclocation
1 diff --git etc/monkeysphere-server.conf etc/monkeysphere-server.conf
2 index c001f2d..d33fd36 100644
3 --- etc/monkeysphere-server.conf
4 +++ etc/monkeysphere-server.conf
5 @@ -17,7 +17,7 @@
6  # authorized_keys file.  '%h' will be replaced by the home directory
7  # of the user, and %u will be replaced by the username of the user.
8  # For purely admin-controlled authorized_user_ids, you might put them
9 -# in /etc/monkeysphere/authorized_user_ids/%u, for instance.
10 +# in /usr/local/etc/monkeysphere/authorized_user_ids/%u, for instance.
11  #AUTHORIZED_USER_IDS="%h/.monkeysphere/authorized_user_ids"
12  
13  # Whether to add user controlled authorized_keys file to
14 diff --git man/man1/monkeysphere.1 man/man1/monkeysphere.1
15 index 3ece735..09320d2 100644
16 --- man/man1/monkeysphere.1
17 +++ man/man1/monkeysphere.1
18 @@ -111,7 +111,7 @@ Path to ssh authorized_keys file (~/.ssh/authorized_keys).
19  ~/.monkeysphere/monkeysphere.conf
20  User monkeysphere config file.
21  .TP
22 -/etc/monkeysphere/monkeysphere.conf
23 +/usr/local/etc/monkeysphere/monkeysphere.conf
24  System-wide monkeysphere config file.
25  .TP
26  ~/.monkeysphere/authorized_user_ids
27 diff --git man/man8/monkeysphere-server.8 man/man8/monkeysphere-server.8
28 index f207e2c..360408e 100644
29 --- man/man8/monkeysphere-server.8
30 +++ man/man8/monkeysphere-server.8
31 @@ -203,10 +203,10 @@ User to control authentication keychain (monkeysphere).
32  .SH FILES
33  
34  .TP
35 -/etc/monkeysphere/monkeysphere-server.conf
36 +/usr/local/etc/monkeysphere/monkeysphere-server.conf
37  System monkeysphere-server config file.
38  .TP
39 -/etc/monkeysphere/monkeysphere.conf
40 +/usr/local/etc/monkeysphere/monkeysphere.conf
41  System-wide monkeysphere config file.
42  .TP
43  /var/lib/monkeysphere/authorized_keys/USER
44 --- src/common.orig     2008-10-12 14:58:00.000000000 -0400
45 +++ src/common  2008-10-25 17:40:34.000000000 -0400
46 @@ -16,7 +16,7 @@
47  ### COMMON VARIABLES
48  
49  # managed directories
50 -SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"}
51 +SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/usr/local/etc/monkeysphere"}
52  export SYSCONFIGDIR
53  
54  ########################################################################