summaryrefslogtreecommitdiff
path: root/packaging/freebsd/files/patch-etclocation
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2008-10-26 12:34:56 -0400
committerMicah Anderson <micah@riseup.net>2008-10-26 12:34:56 -0400
commit20e88948f035c56d51f07c53de50b75df57fc816 (patch)
treeb949e026bbf3687f05c1d98e1e22d9f9c0d31f62 /packaging/freebsd/files/patch-etclocation
parent5722f3ce688ce4f71a7f3a4a3aa3d070c3e47014 (diff)
parenteef5c546af5f7a723be67303feee9b05b47b0fdb (diff)
Merge commit 'dkg/master'
Diffstat (limited to 'packaging/freebsd/files/patch-etclocation')
-rw-r--r--packaging/freebsd/files/patch-etclocation12
1 files changed, 5 insertions, 7 deletions
diff --git a/packaging/freebsd/files/patch-etclocation b/packaging/freebsd/files/patch-etclocation
index ebf5c0e..0100a9c 100644
--- a/packaging/freebsd/files/patch-etclocation
+++ b/packaging/freebsd/files/patch-etclocation
@@ -41,16 +41,14 @@ index f207e2c..360408e 100644
System-wide monkeysphere config file.
.TP
/var/lib/monkeysphere/authorized_keys/USER
-diff --git src/common src/common
-index c8a7db6..cb4f8e1 100644
---- src/common
-+++ src/common
+--- src/common.orig 2008-10-12 14:58:00.000000000 -0400
++++ src/common 2008-10-25 17:40:34.000000000 -0400
@@ -16,7 +16,7 @@
### COMMON VARIABLES
# managed directories
--ETC="/etc/monkeysphere"
-+ETC="/usr/local/etc/monkeysphere"
- export ETC
+-SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"}
++SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/usr/local/etc/monkeysphere"}
+ export SYSCONFIGDIR
########################################################################