summaryrefslogtreecommitdiff
path: root/tests/basic
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-10-25 15:02:54 -0400
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-10-25 15:02:54 -0400
commit8473500c66d561b6b8a317d93199f5e653dd8980 (patch)
tree1dac8b29593be74e6074f4be6be54173f56bac09 /tests/basic
parent2983d63efb6371cf7dc8815bfcdbefb42cadb1d3 (diff)
parentbb75d35fb6705d8a75b88af30274703ca84d45f2 (diff)
Merge commit 'dkg/master'
Conflicts: tests/basic
Diffstat (limited to 'tests/basic')
-rwxr-xr-xtests/basic5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/basic b/tests/basic
index d73e162..3f94856 100755
--- a/tests/basic
+++ b/tests/basic
@@ -91,9 +91,12 @@ gpgadmin --sign-key "$HOSTKEYID"
echo "### adding admin as certifier..."
monkeysphere-server add-identity-certifier "$TESTDIR"/home/admin/.gnupg/pubkey.gpg
+# initialize base sshd_config
+cp etc/ssh/sshd_config "$TEMPDIR"/sshd_config
# write the sshd_config
-cat <<EOF > "$SSHD_CONFIG"
+cat <<EOF >> "$SSHD_CONFIG"
HostKey ${MONKEYSPHERE_SYSDATADIR}/ssh_host_rsa_key
+AuthorizedKeysFile ${MONKEYSPHERE_SYSDATADIR}/authorized_keys/%u
EOF
# launch test sshd with the new host key.