projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0d7a924
)
move away from using MONKEYSPHERE_SERVER_CONFIG in test suite.
author
Jameson Graef Rollins
<jrollins@phys.columbia.edu>
Wed, 29 Oct 2008 03:38:07 +0000
(23:38 -0400)
committer
Jameson Graef Rollins
<jrollins@phys.columbia.edu>
Wed, 29 Oct 2008 03:38:07 +0000
(23:38 -0400)
tests/basic
patch
|
blob
|
history
diff --git
a/tests/basic
b/tests/basic
index d79b64b1eb66563033f2caf8ddab74617df66bef..f6fa7fcbf1fed13bf33871594a2636da689b99d8 100755
(executable)
--- a/
tests/basic
+++ b/
tests/basic
@@
-91,7
+91,6
@@
export PATH="$TESTDIR"/../src:"$TESTDIR"/../src/keytrans:"$PATH"
export MONKEYSPHERE_SYSDATADIR="$TEMPDIR"
export MONKEYSPHERE_SYSCONFIGDIR="$TEMPDIR"
export MONKEYSPHERE_SYSDATADIR="$TEMPDIR"
export MONKEYSPHERE_SYSCONFIGDIR="$TEMPDIR"
-export MONKEYSPHERE_SERVER_CONFIG="$TEMPDIR"/monkeysphere-server.conf
export MONKEYSPHERE_SYSSHAREDIR="$TESTDIR"/../src
export MONKEYSPHERE_MONKEYSPHERE_USER=$(whoami)
export MONKEYSPHERE_CHECK_KEYSERVER=false
export MONKEYSPHERE_SYSSHAREDIR="$TESTDIR"/../src
export MONKEYSPHERE_MONKEYSPHERE_USER=$(whoami)
export MONKEYSPHERE_CHECK_KEYSERVER=false
@@
-139,8
+138,8
@@
mkdir -p -m 750 "$MONKEYSPHERE_SYSDATADIR"/gnupg-host
mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/gnupg-authentication
mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/authorized_keys
mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/tmp
mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/gnupg-authentication
mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/authorized_keys
mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/tmp
-cp etc/monkeysphere/monkeysphere-server.conf "$
MONKEYSPHERE_SERVER_CONFIG"
-cat <<EOF >> "$
MONKEYSPHERE_SERVER_CONFIG"
+cp etc/monkeysphere/monkeysphere-server.conf "$
TEMPDIR"/monkeysphere-server.conf
+cat <<EOF >> "$
TEMPDIR"/monkeysphere-server.conf
AUTHORIZED_USER_IDS="$MONKEYSPHERE_HOME/authorized_user_ids"
EOF
cat <<EOF > "$MONKEYSPHERE_SYSDATADIR"/gnupg-authentication/gpg.conf
AUTHORIZED_USER_IDS="$MONKEYSPHERE_HOME/authorized_user_ids"
EOF
cat <<EOF > "$MONKEYSPHERE_SYSDATADIR"/gnupg-authentication/gpg.conf