summaryrefslogtreecommitdiff
path: root/packaging/freebsd/files/patch-varlocation
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-10-25 19:28:19 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-10-25 19:28:19 -0400
commit37045570e881c240c9ff597a6d0612589d7c26db (patch)
tree68c733599e7d0c18a7beeb31f7327572003aa9a0 /packaging/freebsd/files/patch-varlocation
parent6037a421c142502108ce9525c62cd0db4714ecdb (diff)
freebsd port: changes from anarcat
Diffstat (limited to 'packaging/freebsd/files/patch-varlocation')
-rw-r--r--packaging/freebsd/files/patch-varlocation37
1 files changed, 24 insertions, 13 deletions
diff --git a/packaging/freebsd/files/patch-varlocation b/packaging/freebsd/files/patch-varlocation
index 27f1527..c4d8dcd 100644
--- a/packaging/freebsd/files/patch-varlocation
+++ b/packaging/freebsd/files/patch-varlocation
@@ -42,19 +42,6 @@ index f207e2c..29c7b6a 100644
Monkeysphere authentication GNUPG home directory.
.SH AUTHOR
-diff --git src/monkeysphere-server src/monkeysphere-server
-index e590f3c..f46e8bb 100755
---- src/monkeysphere-server
-+++ src/monkeysphere-server
-@@ -17,7 +17,7 @@ SHARE=${MONKEYSPHERE_SHARE:="/usr/share/monkeysphere"}
- export SHARE
- . "${SHARE}/common" || exit 1
-
--VARLIB="/var/lib/monkeysphere"
-+VARLIB="/var/monkeysphere"
- export VARLIB
-
- # UTC date in ISO 8601 format if needed
diff --git doc/getting-started-admin.mdwn doc/getting-started-admin.mdwn
index 6c8ad53..67fdda1 100644
--- doc/getting-started-admin.mdwn
@@ -77,3 +64,27 @@ index 6c8ad53..67fdda1 100644
And then read the section below about how to ensure these files are
maintained. You'll need to restart `sshd` to have your changes take
+--- src/monkeysphere-server.orig 2008-10-25 18:01:19.000000000 -0400
++++ src/monkeysphere-server 2008-10-25 18:01:24.000000000 -0400
+@@ -17,7 +17,7 @@
+ export SYSSHAREDIR
+ . "${SYSSHAREDIR}/common" || exit 1
+
+-SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere"}
++SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/monkeysphere"}
+ export SYSDATADIR
+
+ # UTC date in ISO 8601 format if needed
+--- etc/gnupg-authentication.conf.orig 2008-10-25 18:02:58.000000000 -0400
++++ etc/gnupg-authentication.conf 2008-10-25 18:03:04.000000000 -0400
+@@ -4,8 +4,8 @@
+ # It is highly recommended that you
+ # DO NOT MODIFY
+ # these variables.
+-primary-keyring /var/lib/monkeysphere/gnupg-authentication/pubring.gpg
+-keyring /var/lib/monkeysphere/gnupg-host/pubring.gpg
++primary-keyring /var/monkeysphere/gnupg-authentication/pubring.gpg
++keyring /var/monkeysphere/gnupg-host/pubring.gpg
+
+ # PGP keyserver to use for PGP queries.
+ keyserver hkp://pgp.mit.edu