summaryrefslogtreecommitdiff
path: root/packaging/freebsd/files/patch-varlocation
blob: 27f15279e5952e311c6dd2706f32c84ccdfdd952 (plain)
  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. -HostKey /var/lib/monkeysphere/ssh_host_rsa_key
  9. +HostKey /var/monkeysphere/ssh_host_rsa_key
  10. In order for users logging into the system to be able to verify the
  11. host via the monkeysphere, at least one person (e.g. a server admin)
  12. @@ -170,7 +170,7 @@ users. You must also tell sshd to look at the monkeysphere-generated
  13. authorized_keys file for user authentication by setting the following
  14. in the sshd_config:
  15. -AuthorizedKeysFile /var/lib/monkeysphere/authorized_keys/%u
  16. +AuthorizedKeysFile /var/monkeysphere/authorized_keys/%u
  17. It is recommended to add "monkeysphere-server update-users" to a
  18. system crontab, so that user keys are kept up-to-date, and key
  19. @@ -209,17 +209,17 @@ System monkeysphere-server config file.
  20. /etc/monkeysphere/monkeysphere.conf
  21. System-wide monkeysphere config file.
  22. .TP
  23. -/var/lib/monkeysphere/authorized_keys/USER
  24. +/var/monkeysphere/authorized_keys/USER
  25. Monkeysphere-generated user authorized_keys files.
  26. .TP
  27. -/var/lib/monkeysphere/ssh_host_rsa_key
  28. +/var/monkeysphere/ssh_host_rsa_key
  29. Copy of the host's private key in ssh format, suitable for use by
  30. sshd.
  31. .TP
  32. -/var/lib/monkeysphere/gnupg-host
  33. +/var/monkeysphere/gnupg-host
  34. Monkeysphere host GNUPG home directory.
  35. .TP
  36. -/var/lib/monkeysphere/gnupg-authentication
  37. +/var/monkeysphere/gnupg-authentication
  38. Monkeysphere authentication GNUPG home directory.
  39. .SH AUTHOR
  40. diff --git src/monkeysphere-server src/monkeysphere-server
  41. index e590f3c..f46e8bb 100755
  42. --- src/monkeysphere-server
  43. +++ src/monkeysphere-server
  44. @@ -17,7 +17,7 @@ SHARE=${MONKEYSPHERE_SHARE:="/usr/share/monkeysphere"}
  45. export SHARE
  46. . "${SHARE}/common" || exit 1
  47. -VARLIB="/var/lib/monkeysphere"
  48. +VARLIB="/var/monkeysphere"
  49. export VARLIB
  50. # UTC date in ISO 8601 format if needed
  51. diff --git doc/getting-started-admin.mdwn doc/getting-started-admin.mdwn
  52. index 6c8ad53..67fdda1 100644
  53. --- doc/getting-started-admin.mdwn
  54. +++ doc/getting-started-admin.mdwn
  55. @@ -30,7 +30,7 @@ To use the newly-generated host key for ssh connections, put the
  56. following line in `/etc/ssh/sshd_config` (be sure to remove references
  57. to any other keys):
  58. - HostKey /var/lib/monkeysphere/ssh_host_rsa_key
  59. + HostKey /var/monkeysphere/ssh_host_rsa_key
  60. FIXME: should we just suggest symlinks in the filesystem here instead?
  61. @@ -40,7 +40,7 @@ To enable users to use the monkeysphere to authenticate using the
  62. OpenPGP web of trust, add this line to `/etc/ssh/sshd_config` (again,
  63. making sure that no other AuthorizedKeysFile directive exists):
  64. - AuthorizedKeysFile /var/lib/monkeysphere/authorized_keys/%u
  65. + AuthorizedKeysFile /var/monkeysphere/authorized_keys/%u
  66. And then read the section below about how to ensure these files are
  67. maintained. You'll need to restart `sshd` to have your changes take