From 3ecf38b401eaf1ff1efc174172876b2e2e0b9748 Mon Sep 17 00:00:00 2001
From: Christopher Manning <cmanning@civisanalytics.com>
Date: Tue, 27 Oct 2015 17:28:04 -0500
Subject: [PATCH] Vagrantfile: use recommended bootstrap scripts for
 provisioning

Also remove an incorrect command from the Vagrant instructions in
`docs/contributing.rst`.
---
 Vagrantfile           | 9 +++------
 docs/contributing.rst | 1 -
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index d54e4ea23..a2759440c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -4,14 +4,11 @@
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
 
-# Setup instructions from docs/using.rst
+# Setup instructions from docs/contributing.rst
 $ubuntu_setup_script = <<SETUP_SCRIPT
 cd /vagrant
-sudo ./bootstrap/ubuntu.sh
-if [ ! -d "venv" ]; then
-  virtualenv --no-site-packages -p python2 venv
-  ./venv/bin/pip install -r requirements.txt -e acme -e .[dev,docs,testing] -e letsencrypt-apache -e letsencrypt-nginx
-fi
+./bootstrap/install-deps.sh
+./bootstrap/dev/venv.sh
 SETUP_SCRIPT
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 5f2a84605..f82d7a583 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -312,7 +312,6 @@ synced to ``/vagrant``, so you can get started with:
 
   vagrant ssh
   cd /vagrant
-  ./venv/bin/pip install -r requirements.txt .[dev,docs,testing]
   sudo ./venv/bin/letsencrypt
 
 Support for other Linux distributions coming soon.