projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b2bf2d1
)
fix some test problems related to gpg.conf locations
author
Micah Anderson
<micah@riseup.net>
Sun, 1 Feb 2009 03:55:08 +0000
(22:55 -0500)
committer
Micah Anderson
<micah@riseup.net>
Sun, 1 Feb 2009 03:55:08 +0000
(22:55 -0500)
tests/basic
patch
|
blob
|
history
diff --git
a/tests/basic
b/tests/basic
index 0d780530fbaaab30a36294f82870b61d767c6f17..b8ab4fcbc9463a9c9a952c29c56e50975332aee5 100755
(executable)
--- 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"/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
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
# 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
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\ )
HOSTKEYID=$( monkeysphere-host show-key | grep '^OpenPGP fingerprint: ' | cut -f3 -d\ )