From bbbc5bb8accf1db41d6a95e227f028376823cddf Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 31 Jan 2009 23:44:38 -0500
Subject: fix some things bugs from the separation transition, and try to fix
 the test scripts

---
 tests/basic                                            | 18 +++++++++---------
 .../etc/monkeysphere/monkeysphere-authentication.conf  |  5 +++++
 tests/etc/monkeysphere/monkeysphere-server.conf        |  5 -----
 3 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 tests/etc/monkeysphere/monkeysphere-authentication.conf
 delete mode 100644 tests/etc/monkeysphere/monkeysphere-server.conf

(limited to 'tests')

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-authentication.conf b/tests/etc/monkeysphere/monkeysphere-authentication.conf
new file mode 100644
index 0000000..9cc396f
--- /dev/null
+++ b/tests/etc/monkeysphere/monkeysphere-authentication.conf
@@ -0,0 +1,5 @@
+# Base monkeysphere-server.conf for monkeysphere tests
+
+# AUTHORIZED_USER_IDS variable will be added dynamically during test.
+
+RAW_AUTHORIZED_KEYS=none
diff --git a/tests/etc/monkeysphere/monkeysphere-server.conf b/tests/etc/monkeysphere/monkeysphere-server.conf
deleted file mode 100644
index 9cc396f..0000000
--- a/tests/etc/monkeysphere/monkeysphere-server.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Base monkeysphere-server.conf for monkeysphere tests
-
-# AUTHORIZED_USER_IDS variable will be added dynamically during test.
-
-RAW_AUTHORIZED_KEYS=none
-- 
cgit v1.2.3