summaryrefslogtreecommitdiff
path: root/tests/basic
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2009-01-31 22:55:08 -0500
committerMicah Anderson <micah@riseup.net>2009-01-31 22:55:08 -0500
commitc396f64d3fdc5d924ee1155b66d32cf585cb8452 (patch)
treeacae2661c36c69dc2407d519560923a0df9e1835 /tests/basic
parentb2bf2d17cd6eb5edcb69d51867b7d17e60751986 (diff)
fix some test problems related to gpg.conf locations
Diffstat (limited to 'tests/basic')
-rwxr-xr-xtests/basic5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/basic b/tests/basic
index 0d78053..b8ab4fc 100755
--- a/tests/basic
+++ b/tests/basic
@@ -173,6 +173,7 @@ echo "### configuring monkeysphere..."
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
@@ -189,10 +190,10 @@ EOF
# create a new host key
echo "### generating server key..."
# add gpg.conf with quick-random
-get_gpg_prng_arg >> "$MONKEYSPHERE_SYSCONFIGDIR"/gnupg-host/gpg.conf
+get_gpg_prng_arg >> "$MONKEYSPHERE_SYSCONFIGDIR"/host/gpg.conf
echo | monkeysphere-host expert gen-key --length 1024 --expire 0 testhost
# remove the gpg.conf
-rm "$MONKEYSPHERE_SYSCONFIGDIR"/gnupg-host/gpg.conf
+rm "$MONKEYSPHERE_SYSCONFIGDIR"/host/gpg.conf
HOSTKEYID=$( monkeysphere-host show-key | grep '^OpenPGP fingerprint: ' | cut -f3 -d\ )