[tor-commits] [ooni-probe/master] Launch oonid by default and add notes on how to use the web UI

[art at torproject.org]

commit 779fa676111d55f55e2f87c9f85a90b493844398
Author: Arturo Filastò <art at fuffa.org>
Date:   Thu Aug 15 20:52:46 2013 +0200

    Launch oonid by default and add notes on how to use the web UI
---
 Vagrantfile                |    9 +++++++--
 data/ooniprobe.conf.sample |    6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index b1c6fe4..9099960 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -31,8 +31,12 @@ make lists 2>&1 > /dev/null
 # https://code.google.com/p/pypcap/issues/detail?id=27
 # pip install pydnet pypcap
 
-echo Login using 'vagrant ssh', and dont forget to run ooniprobe as root.
-echo First run: 'sudo su; cd /usr/share/ooni; ./bin/ooniprobe -i decks/before_i_commit.testdeck'
+/ooni/bin/oonid
+echo "You may now visit http://localhost:8042/ to start running some ooniprobe tests"
+echo ""
+echo "Or if you are a bit more h4x0r you can ssh into the box and use the ooniprobe CLI"
+echo "Login using 'vagrant ssh', and dont forget to run ooniprobe as root."
+echo "First run: 'sudo su; cd /usr/share/ooni; ./bin/ooniprobe -i decks/before_i_commit.testdeck'"
 
 SCRIPT
 
@@ -42,4 +46,5 @@ SCRIPT
 
 Vagrant.configure("2") do |config|
     config.vm.provision :shell, :inline => $script
+    config.vm.network :forwarded_port, guest: 8042, host: 8042
 end
diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample
index 54f7b83..7707be0 100644
--- a/data/ooniprobe.conf.sample
+++ b/data/ooniprobe.conf.sample
@@ -32,7 +32,7 @@ advanced:
     #interface: wlan0
     # If you do not specify start_tor, you will have to have Tor running and
     # explicitly set the control port and SOCKS port
-    start_tor: false
+    start_tor: true
     # After how many seconds we should give up on a particular measurement
     measurement_timeout: 30
     # After how many retries we should give up on a measurement
@@ -49,8 +49,8 @@ advanced:
     data_dir: /usr/share/ooni/
     oonid_api_port: 8042
 tor:
-    socks_port: 9050
-    #control_port: 9051
+    socks_port: 9001
+    control_port: 9002
     # Specify the absolute path to the Tor bridges to use for testing
     #bridges: bridges.list
     # Specify path of the tor datadirectory.