projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added fake admin key (ID 7005D3BE) for test suite.
[monkeysphere.git]
/
src
/
monkeysphere-server
diff --git
a/src/monkeysphere-server
b/src/monkeysphere-server
index db3687bda3b7c185c7bc1e34f63f853afaa1e1eb..6cef8974693e60abfccfc4ff97ea350c32d13673 100755
(executable)
--- a/
src/monkeysphere-server
+++ b/
src/monkeysphere-server
@@
-13,12
+13,12
@@
########################################################################
PGRM=$(basename $0)
########################################################################
PGRM=$(basename $0)
-SHARE=${MONKEYSPHERE_SHARE:
=
"/usr/share/monkeysphere"}
+SHARE=${MONKEYSPHERE_SHARE:
-
"/usr/share/monkeysphere"}
export SHARE
. "${SHARE}/common" || exit 1
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')
# 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
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
# set empty config variable with ones from the environment, or with
# defaults