After seeing it on GitHub I just couldn't stand seeing the private SS…

…H key checked in, even temporarily, so I'm removing it. For now we'll have to remember to generate this before running everything, and there's an error message if we forget (on the host VM at least).
rnirmal · Jun 30, 2011 · 6937676 · 6937676
1 parent dda461b
commit 6937676
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,4 @@ contrib/tty.tgz
 *.sqlite
 vagrantup.*
 .apitoken
+integration/vagrant/common/ssh/id_rsa*
diff --git a/integration/vagrant/common/ssh/add_key_to_host.sh b/integration/vagrant/common/ssh/add_key_to_host.sh
@@ -0,0 +1,10 @@
+# This is meant to be called from the volume box.
+if [ ! -f /vagrant-common/ssh/id_rsa ] || [ ! -f /vagrant-common/ssh/id_rsa.pub ]
+then
+    echo 'Missing ssh key. Use ssh-keygen to create key at /vagrant-common/ssh/ (leave options such as passphrase empty).'
+    exit 1
+fi
+cp /vagrant-common/ssh/id_rsa.pub /home/vagrant/.ssh/id_rsa.pub
+cp /vagrant-common/ssh/id_rsa /home/vagrant/.ssh/id_rsa
+sudo cp /vagrant-common/ssh/id_rsa.pub /root/.ssh/id_rsa.pub
+sudo cp /vagrant-common/ssh/id_rsa.pub /root/.ssh/id_rsa
diff --git a/integration/vagrant/common/ssh/id_rsa b/integration/vagrant/common/ssh/id_rsa
diff --git a/integration/vagrant/common/ssh/id_rsa.pub b/integration/vagrant/common/ssh/id_rsa.pub