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
  10 +# in /usr/local/etc/monkeysphere/authorized_user_ids/%u
  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 diff --git src/common src/common
  45 index c8a7db6..cb4f8e1 100644
  46 --- src/common
  47 +++ src/common
  48 @@ -16,7 +16,7 @@
  49  ### COMMON VARIABLES
  50
  51  # managed directories
  52 -ETC="/etc/monkeysphere"
  53 +ETC="/usr/local/etc/monkeysphere"
  54  export ETC
  55
  56  ########################################################################