[tor-commits] [ooni-probe/master] Have some slightly saner defaults for the config file

[art at torproject.org]

commit 982cc75d654414471bd7a4e38ceb14b572442354
Author: Arturo Filastò <art at fuffa.org>
Date:   Sun May 5 16:30:34 2013 +0200

    Have some slightly saner defaults for the config file
---
 ooni/director.py      |   11 ++++++++---
 ooniprobe.conf.sample |    6 +++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ooni/director.py b/ooni/director.py
index 7ad99a9..c796d6e 100644
--- a/ooni/director.py
+++ b/ooni/director.py
@@ -298,9 +298,14 @@ class Director(object):
         log.debug("Setting control port as %s" % tor_config.ControlPort)
         log.debug("Setting SOCKS port as %s" % tor_config.SocksPort)
 
-        d = launch_tor(tor_config, reactor,
-                tor_binary=config.advanced.tor_binary,
-                progress_updates=updates)
+        if config.advanced.tor_binary:
+            d = launch_tor(tor_config, reactor,
+                           tor_binary=config.advanced.tor_binary,
+                           progress_updates=updates)
+        else:
+            d = launch_tor(tor_config, reactor,
+                           progress_updates=updates)
+
         d.addCallback(setup_complete)
         d.addErrback(setup_failed)
         return d
diff --git a/ooniprobe.conf.sample b/ooniprobe.conf.sample
index 27a4fb3..53e7ac7 100644
--- a/ooniprobe.conf.sample
+++ b/ooniprobe.conf.sample
@@ -25,14 +25,14 @@ advanced:
     # /path/to/ooni-probe/data/
     geoip_data_dir: /usr/share/GeoIP/
     debug: true
-    tor_binary: '/usr/sbin/tor'
+    # tor_binary: '/usr/sbin/tor'
     # For auto detection
     interface: auto
     # Of specify a specific interface
     #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: true
+    start_tor: false
     # 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
@@ -46,7 +46,7 @@ advanced:
     # How many reports to perform concurrently
     reporting_concurrency: 20
 tor:
-    #socks_port: 9050
+    socks_port: 9050
     #control_port: 9051
     # Specify the absolute path to the Tor bridges to use for testing
     bridges: bridges.list