summaryrefslogtreecommitdiff
path: root/packaging/freebsd/files/patch-varlocation
blob: c4d8dcdd03eef6a607e9776d9020c1e379d8ea12 (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 doc/getting-started-admin.mdwn doc/getting-started-admin.mdwn
  41. index 6c8ad53..67fdda1 100644
  42. --- doc/getting-started-admin.mdwn
  43. +++ doc/getting-started-admin.mdwn
  44. @@ -30,7 +30,7 @@ To use the newly-generated host key for ssh connections, put the
  45. following line in `/etc/ssh/sshd_config` (be sure to remove references
  46. to any other keys):
  47. - HostKey /var/lib/monkeysphere/ssh_host_rsa_key
  48. + HostKey /var/monkeysphere/ssh_host_rsa_key
  49. FIXME: should we just suggest symlinks in the filesystem here instead?
  50. @@ -40,7 +40,7 @@ To enable users to use the monkeysphere to authenticate using the
  51. OpenPGP web of trust, add this line to `/etc/ssh/sshd_config` (again,
  52. making sure that no other AuthorizedKeysFile directive exists):
  53. - AuthorizedKeysFile /var/lib/monkeysphere/authorized_keys/%u
  54. + AuthorizedKeysFile /var/monkeysphere/authorized_keys/%u
  55. And then read the section below about how to ensure these files are
  56. maintained. You'll need to restart `sshd` to have your changes take
  57. --- src/monkeysphere-server.orig 2008-10-25 18:01:19.000000000 -0400
  58. +++ src/monkeysphere-server 2008-10-25 18:01:24.000000000 -0400
  59. @@ -17,7 +17,7 @@
  60. export SYSSHAREDIR
  61. . "${SYSSHAREDIR}/common" || exit 1
  62. -SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere"}
  63. +SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/monkeysphere"}
  64. export SYSDATADIR
  65. # UTC date in ISO 8601 format if needed
  66. --- etc/gnupg-authentication.conf.orig 2008-10-25 18:02:58.000000000 -0400
  67. +++ etc/gnupg-authentication.conf 2008-10-25 18:03:04.000000000 -0400
  68. @@ -4,8 +4,8 @@
  69. # It is highly recommended that you
  70. # DO NOT MODIFY
  71. # these variables.
  72. -primary-keyring /var/lib/monkeysphere/gnupg-authentication/pubring.gpg
  73. -keyring /var/lib/monkeysphere/gnupg-host/pubring.gpg
  74. +primary-keyring /var/monkeysphere/gnupg-authentication/pubring.gpg
  75. +keyring /var/monkeysphere/gnupg-host/pubring.gpg
  76. # PGP keyserver to use for PGP queries.
  77. keyserver hkp://pgp.mit.edu