summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-09-03 13:41:28 -0700
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-09-03 13:41:28 -0700
commitb7a13e19393e347ba66196a49e972d722d7d4780 (patch)
tree045738d1b0eb3fe12635347e611a24944b65a2c2 /src
parent52d692d728d7d56ec0f17e0a9afbb6579a7eece9 (diff)
move config directory to ~/.monkeysphere
Diffstat (limited to 'src')
-rwxr-xr-xsrc/monkeysphere2
-rwxr-xr-xsrc/monkeysphere-server2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/monkeysphere b/src/monkeysphere
index 471da20..59cb3d6 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -273,7 +273,7 @@ unset AUTHORIZED_KEYS
[ -r "${ETC}/monkeysphere.conf" ] && . "${ETC}/monkeysphere.conf"
# set monkeysphere home directory
-MONKEYSPHERE_HOME=${MONKEYSPHERE_HOME:="${HOME}/.config/monkeysphere"}
+MONKEYSPHERE_HOME=${MONKEYSPHERE_HOME:="${HOME}/.monkeysphere"}
mkdir -p -m 0700 "$MONKEYSPHERE_HOME"
# load local config
diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 4c7df19..d2cac0e 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -858,7 +858,7 @@ unset MONKEYSPHERE_USER
# defaults
LOG_LEVEL=${MONKEYSPHERE_LOG_LEVEL:=${LOG_LEVEL:="INFO"}}
KEYSERVER=${MONKEYSPHERE_KEYSERVER:=${KEYSERVER:="subkeys.pgp.net"}}
-AUTHORIZED_USER_IDS=${MONKEYSPHERE_AUTHORIZED_USER_IDS:=${AUTHORIZED_USER_IDS:="%h/.config/monkeysphere/authorized_user_ids"}}
+AUTHORIZED_USER_IDS=${MONKEYSPHERE_AUTHORIZED_USER_IDS:=${AUTHORIZED_USER_IDS:="%h/.monkeysphere/authorized_user_ids"}}
RAW_AUTHORIZED_KEYS=${MONKEYSPHERE_RAW_AUTHORIZED_KEYS:=${RAW_AUTHORIZED_KEYS:="%h/.ssh/authorized_keys"}}
MONKEYSPHERE_USER=${MONKEYSPHERE_MONKEYSPHERE_USER:=${MONKEYSPHERE_USER:="monkeysphere"}}