From c5b6958858173044c74af2b0af6a8d46e5019221 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Tue, 28 Oct 2008 23:38:07 -0400 Subject: [PATCH] move away from using MONKEYSPHERE_SERVER_CONFIG in test suite. --- tests/basic | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/basic b/tests/basic index d79b64b..f6fa7fc 100755 --- 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_SERVER_CONFIG="$TEMPDIR"/monkeysphere-server.conf 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 -cp etc/monkeysphere/monkeysphere-server.conf "$MONKEYSPHERE_SERVER_CONFIG" -cat <> "$MONKEYSPHERE_SERVER_CONFIG" +cp etc/monkeysphere/monkeysphere-server.conf "$TEMPDIR"/monkeysphere-server.conf +cat <> "$TEMPDIR"/monkeysphere-server.conf AUTHORIZED_USER_IDS="$MONKEYSPHERE_HOME/authorized_user_ids" EOF cat < "$MONKEYSPHERE_SYSDATADIR"/gnupg-authentication/gpg.conf -- 2.25.1