[tor-commits] [oonib/master] Vagrantfile: make sure it actually works

[art at torproject.org]

commit 0c89c56fab800675223d14c4729f1c737c44337b
Author: Simone Basso <bassosimone at gmail.com>
Date:   Mon Apr 4 16:13:12 2016 +0200

    Vagrantfile: make sure it actually works
    
    From the works-for-me-on-vagrant-isnt-this-ironic dept.:
    
    1) stop provision script on error
    
    2) update url required to get latest version of pip
    
    3) zap virtualenv: it is not needed on a customly provisoned temporary virtual machine, plus the `mkvirtualenv` command exited with nonzero exit code for a reason that I wasn't able to understand despite I tried to do so
    
    4) fix typo
    
    5) don't pass nonexisting argument to pip
    
    6) add instructions explaining how to test oonib.
    
    (Related pull request: https://github.com/TheTorProject/ooni-backend/pull/64)
---
 Vagrantfile | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 4a89157..b2c97b0 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -111,26 +111,20 @@ Vagrant.configure("2") do |config|
 end
 
 $setup_script = <<SCRIPT
+set -e
 apt-get update
 apt-get -y install curl python-setuptools python-dev libsqlite3-dev libffi-dev
 
 echo "Updating to the latest version of PIP"
 cd /tmp/
 
-curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py
+curl --fail -O https://bootstrap.pypa.io/get-pip.py
 python ./get-pip.py  ## pip (>=1.3.0) is recommended for security reasons
 
 sudo update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0
 
 echo "Installing virtualenv and virtualenvwrapper..."
 
-pip install --upgrade virtualenv virtualenvwrapper
-export WORKON_HOME=~/.virtualenvs && mkdir -p $WORKON_HOME
-
-source /usr/local/bin/virtualenvwrapper.sh
-
-mkvirtualenv -a $PWD --unzip-setuptools --setuptools --no-site-packages oonib
-
 echo "Installing Tor..."
 
 echo "deb http://deb.torproject.org/torproject.org precise main" >> /etc/apt/sources.list
@@ -152,12 +146,14 @@ openssl x509 -req -days 365 -in server.csr -signkey private.key -out certificate
 
 cp oonib.conf.example oonib.conf
 
-echo "Installing oonib depedencies"
-pip install -r requirements.txt --use-mirrors
-
-echo "Installing oonib"
-python setup.py install
+echo "Installing oonib dependencies"
+pip install -r requirements.txt
 
+echo "Now:"
+echo "1. vagrant ssh"
+echo "2. cd /data/oonib"
+echo "3. vi oonib.conf  # possibly"
+echo "4. sudo ./bin/oonib"
 SCRIPT
 
 Vagrant.configure("2") do |config|