diff options
| author | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-06-24 00:42:37 -0400 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-06-24 00:42:37 -0400 |
| commit | 2253eae310120e49e0ae93cec273b48c0d8f26a8 (patch) | |
| tree | 9ee72842408f2d5d629389931f37823eaaf61914 /src/monkeysphere-server | |
| parent | 7d02db7106da26f7705563297544a4ba1edfc71b (diff) | |
Small tweaks to prepare for upcoming changes.
Diffstat (limited to 'src/monkeysphere-server')
| -rwxr-xr-x | src/monkeysphere-server | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/monkeysphere-server b/src/monkeysphere-server index a198c33..b711fc5 100755 --- a/src/monkeysphere-server +++ b/src/monkeysphere-server @@ -158,6 +158,7 @@ MS_CONF=${MS_CONF:-"$MS_HOME"/monkeysphere-server.conf} [ -e "$MS_CONF" ] && . "$MS_CONF" # set empty config variable with defaults +MONKEYSPHERE_USER=${MONKEYSPHERE_USER:-"monkeysphere"} KEYSERVER=${KEYSERVER:-"subkeys.pgp.net"} CHECK_KEYSERVER=${CHECK_KEYSERVER:="true"} AUTHORIZED_USER_IDS=${AUTHORIZED_USER_IDS:-"%h/.config/monkeysphere/authorized_user_ids"} @@ -168,7 +169,9 @@ REQUIRED_USER_KEY_CAPABILITY=${REQUIRED_USER_KEY_CAPABILITY:-"a"} GNUPGHOME_HOST=${GNUPGHOME_HOST:-"${VARLIB}/gnupg-host"} GNUPGHOME_AUTHENTICATION=${GNUPGHOME_AUTHENTICATION:-"${VARLIB}/gnupg-authentication"} -# set default GNUPGHOME, and make sure the directory exists +# set default GNUPGHOME, and make sure the directory exists. this is +# true for all functions expect user authentication +# (ie. update-users). GNUPGHOME="$GNUPGHOME_HOST" export GNUPGHOME mkdir -p -m 0700 "$GNUPGHOME" |