diff options
| author | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-10-11 13:50:21 -0400 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-10-11 13:50:21 -0400 |
| commit | 589b81e8cebece77349bbba828dae5c1fe0ca86a (patch) | |
| tree | 88a158b6892650fac90d3fa188646cf1c82b1da1 /src/monkeysphere-server | |
| parent | 5a83949a37cb3f57b67a1d8d2308290f9fd55b93 (diff) | |
| parent | e1bcdeed65a6449b78f1f8090a49ce01ed0b872d (diff) | |
Merge commit 'dkg/master'
Diffstat (limited to 'src/monkeysphere-server')
| -rwxr-xr-x | src/monkeysphere-server | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/monkeysphere-server b/src/monkeysphere-server index db3687b..6cef897 100755 --- a/src/monkeysphere-server +++ b/src/monkeysphere-server @@ -13,12 +13,12 @@ ######################################################################## PGRM=$(basename $0) -SHARE=${MONKEYSPHERE_SHARE:="/usr/share/monkeysphere"} +SHARE=${MONKEYSPHERE_SHARE:-"/usr/share/monkeysphere"} export SHARE . "${SHARE}/common" || exit 1 -VARLIB="/var/lib/monkeysphere" -export VARLIB +SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere" +export SYSDATADIR # UTC date in ISO 8601 format if needed DATE=$(date -u '+%FT%T') @@ -914,7 +914,7 @@ unset RAW_AUTHORIZED_KEYS unset MONKEYSPHERE_USER # load configuration file -[ -e ${MONKEYSPHERE_SERVER_CONFIG:="${ETC}/monkeysphere-server.conf"} ] && . "$MONKEYSPHERE_SERVER_CONFIG" +[ -e ${MONKEYSPHERE_SERVER_CONFIG:="${SYSCONFIGDIR}/monkeysphere-server.conf"} ] && . "$MONKEYSPHERE_SERVER_CONFIG" # set empty config variable with ones from the environment, or with # defaults |