diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-09-03 17:02:16 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-09-03 17:02:16 -0400 |
| commit | 43504b118f0eb3a383687b2398b18199f6a307e7 (patch) | |
| tree | 5225183d4e99244c34d080454c4de39e2e49a715 /src | |
| parent | 033b0f3784f99ab5cd7445d7b8499f73fcc22b18 (diff) | |
| parent | b7a13e19393e347ba66196a49e972d722d7d4780 (diff) | |
Merge commit 'jrollins/master'
Diffstat (limited to 'src')
| -rwxr-xr-x | src/monkeysphere | 2 | ||||
| -rwxr-xr-x | src/monkeysphere-server | 2 |
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"}} |