diff options
| author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-01-31 23:44:38 -0500 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-01-31 23:44:38 -0500 |
| commit | bbbc5bb8accf1db41d6a95e227f028376823cddf (patch) | |
| tree | 6b579205e538dd7033ec78dbd373582f328c9311 /tests | |
| parent | 2e534772b9b105ceabfe140d1552770b5c9d76ea (diff) | |
fix some things bugs from the separation transition, and try to fix the test scripts
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/basic | 18 | ||||
| -rw-r--r-- | tests/etc/monkeysphere/monkeysphere-authentication.conf (renamed from tests/etc/monkeysphere/monkeysphere-server.conf) | 0 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/basic b/tests/basic index b8ab4fc..5006f8f 100755 --- a/tests/basic +++ b/tests/basic @@ -123,7 +123,7 @@ export PATH="$TESTDIR"/../src:"$TESTDIR"/../src/keytrans:"$PATH" export MONKEYSPHERE_SYSDATADIR="$TEMPDIR" export MONKEYSPHERE_SYSCONFIGDIR="$TEMPDIR" -export MONKEYSPHERE_SYSSHAREDIR="$TESTDIR"/../src +export MONKEYSPHERE_SYSSHAREDIR="$TESTDIR"/../src/share export MONKEYSPHERE_MONKEYSPHERE_USER=$(whoami) export MONKEYSPHERE_CHECK_KEYSERVER=false export MONKEYSPHERE_LOG_LEVEL=DEBUG @@ -168,15 +168,15 @@ HostKey ${MONKEYSPHERE_SYSDATADIR}/ssh_host_rsa_key AuthorizedKeysFile ${MONKEYSPHERE_SYSDATADIR}/authentication/authorized_keys/%u EOF -# set up monkeysphere-server -echo "### configuring monkeysphere..." +# set up monkeysphere host +echo "### configuring monkeysphere host..." mkdir -p -m 750 "$MONKEYSPHERE_SYSDATADIR"/host -mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/authentication -mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/authentication/authorized_keys -mkdir -p -m 750 "$MONKEYSPHERE_SYSDATADIR"/authentication/sphere -mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/tmp -cp etc/monkeysphere/monkeysphere-server.conf "$TEMPDIR"/monkeysphere-server.conf -cat <<EOF >> "$TEMPDIR"/monkeysphere-server.conf + +# set up monkeysphere authentication +echo "### configuring monkeysphere authentication..." +mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/authentication/{authorized_keys,core,sphere,tmp} +cp etc/monkeysphere/monkeysphere-authentication.conf "$TEMPDIR"/ +cat <<EOF >> "$TEMPDIR"/monkeysphere-authentication.conf AUTHORIZED_USER_IDS="$MONKEYSPHERE_HOME/authentication/authorized_user_ids" EOF cat <<EOF > "$MONKEYSPHERE_SYSDATADIR"/authentication/sphere/gpg.conf diff --git a/tests/etc/monkeysphere/monkeysphere-server.conf b/tests/etc/monkeysphere/monkeysphere-authentication.conf index 9cc396f..9cc396f 100644 --- a/tests/etc/monkeysphere/monkeysphere-server.conf +++ b/tests/etc/monkeysphere/monkeysphere-authentication.conf |