commit aa766dcb4520fc2c4c1b37444f32d1dd535e4ea0 Author: Arturo Filastò art@fuffa.org Date: Fri Mar 14 15:52:33 2014 +0100
Consider the config file collector option. --- data/ooniprobe.conf.sample | 2 +- ooni/oonicli.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample index d1fd847..d32248f 100644 --- a/data/ooniprobe.conf.sample +++ b/data/ooniprobe.conf.sample @@ -19,7 +19,7 @@ privacy: reports: # This is a packet capture file (.pcap) to load as a test: pcap: null - collector: 'httpo://nkvphnp3p6agi5qq.onion' + collector: null advanced: geoip_data_dir: /usr/share/ooni/geoip debug: false diff --git a/ooni/oonicli.py b/ooni/oonicli.py index ed7b297..4fed4c7 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -232,6 +232,8 @@ def runWithDirector(logging=True, start_tor=True): if not global_options['no-collector']: if global_options['collector']: collector = global_options['collector'] + elif config.reports['collector']: + collector = config.report['collector'] elif net_test_loader.collector: collector = net_test_loader.collector