commit 176f5eff8897f31c4879bbd8225aa23afb4d0d29 Author: Simone Basso bassosimone@gmail.com Date: Wed Dec 7 16:45:12 2016 +0100

"Vagrantfile sleeps with fishes" (#698)

This removes support for Vagrant that has been quite neglected lately in favour of Docker for which we're doing efforts to have continuous integration (and, as such, it should work very well because we will promptly detect breakages).

To zap Vagrant related stuff I did `grep -Rni vagrant` to search for files where Vagrant was mentioned.

Discussed with @hellais. --- README.rst | 33 -------------------- Vagrantfile | 84 --------------------------------------------------- docs/source/index.rst | 32 -------------------- 3 files changed, 149 deletions(-)

diff --git a/README.rst b/README.rst index 0b9d3d2..3de9489 100644 --- a/README.rst +++ b/README.rst @@ -130,39 +130,6 @@ or install ooniprobe as a user::

pip install ooniprobe

- -Other platforms (with Vagrant) ------------------------------- - -1. Install Vagrant (https://www.vagrantup.com/downloads.html) and Install Virtualbox (https://www.virtualbox.org/wiki/Downloads) - -2. On OSX: - -If you don't have it install homebrew http://mxcl.github.io/homebrew/:: - - brew install git - -On debian/ubuntu:: - - sudo apt-get install git - -3. Open a Terminal and run:: - - git clone https://github.com/TheTorProject/ooni-probe.git - cd ooni-probe/ - vagrant up - -4. Login to the box with:: - - vagrant ssh probe - -5. Start ooniprobe agent:: - - ooniprobe-agent start - -6. Connect to the web UI on your host machine at http://localhost:8842/ - - Using ooniprobe ===============

diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index 744246b..0000000 --- a/Vagrantfile +++ /dev/null @@ -1,84 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -$setup_ooniprobe = <<SCRIPT -echo "deb http://deb.torproject.org/torproject.org jessie main" >> /etc/apt/sources.list - -# Install deb.torproject.org key -gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 -gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - - -apt-get update - -apt-get install -y tor deb.torproject.org-keyring - -# Setup for sniffer subsystem -apt-get install -y build-essential libdumbnet-dev libpcap-dev libgeoip-dev libffi-dev python-dev python-pip libssl-dev -cd /data/ooni-probe -python setup.py install - - -echo "To run ooniprobe:" -echo "1. vagrant ssh probe" -echo "2. ooniprobe-agent start" -echo "3. connect to the web UI on your host machine at http://localhost:8042/" - -SCRIPT - -$setup_oonibackend = <<SCRIPT -echo "Installing Tor..." - -echo "deb http://deb.torproject.org/torproject.org jessie main" >> /etc/apt/sources.list - -gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 -gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - - -apt-get update - -apt-get -y install deb.torproject.org-keyring tor tor-geoipdb - -apt-get -y install curl python-pip python-dev libffi-dev - -cd /data/ooni-backend - -echo "Generating SSL keys" - -openssl genrsa -out private.key 4096 -openssl req -new -key private.key -out server.csr -subj '/CN=www.example.com/O=Example/C=AU' - -openssl x509 -req -days 365 -in server.csr -signkey private.key -out certificate.crt - -cp oonib.conf.example /etc/oonibackend.conf - -echo "Installing ooni-backend" -python setup.py install - -echo "" -echo "To run oonibackend:" -echo "1. vagrant ssh backend" -echo "2. vi /etc/oonibackend.conf # possibly" -echo "3. cd /data/ooni-backend" -echo "4. sudo ./bin/oonib -c /etc/oonibackend.conf" - -SCRIPT - -Vagrant.configure("2") do |config| - # Use Debian jessie with the vboxfs contrib add-on - config.vm.box = "debian/contrib-jessie64" - - config.vm.define "probe" do |probe| - probe.vm.network "forwarded_port", guest: 8842, host: 8042 - probe.vm.synced_folder ".", "/data/ooni-probe" - probe.vm.provision :shell, :inline => $setup_ooniprobe - end - - # If we find a ooni-backend directory in ../ooni-backend we configure a - # ooni-backend as well. - if File.directory?("../ooni-backend") - config.vm.define "backend" do |backend| - backend.vm.synced_folder "../ooni-backend", "/data/ooni-backend" - backend.vm.provision :shell, :inline => $setup_oonibackend - end - end - -end diff --git a/docs/source/index.rst b/docs/source/index.rst index 13f7a8f..d7574ac 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -147,38 +147,6 @@ Then you should be able to install ooniprobe by running::

sudo pip install ooniprobe

- -Other platforms (with Vagrant) ------------------------------- - -1. Install Vagrant (https://www.vagrantup.com/downloads.html) and Install Virtualbox (https://www.virtualbox.org/wiki/Downloads) - -2. On OSX: - -If you don't have it install homebrew http://mxcl.github.io/homebrew/:: - - brew install git - -On debian/ubuntu:: - - sudo apt-get install git - -3. Open a Terminal and run:: - - git clone https://git.torproject.org/ooni-probe.git - cd ooni-probe/ - vagrant up - -4. Login to the box with:: - - vagrant ssh - -ooniprobe will be installed in ``/ooni``. - -5. You can run tests with:: - - ooniprobe blocking/http_requests -f /ooni/example_inputs/alexa-top-1k.txt - Configuring ooniprobe ---------------------