commit cd644817d49784eac341d4625a8eed17a5f328f6 Author: Arturo Filastò art@fuffa.org Date: Wed Nov 28 18:18:33 2012 +0100

Update .gitignore to ignore ooniprobe.conf --- .gitignore | 2 +- ooniprobe.conf | 38 -------------------------------------- ooniprobe.conf.sample | 5 +++-- 3 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/.gitignore b/.gitignore index 4cb0775..2dada89 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,4 @@ pcaps/ report*.yaml docs/build/* data/*.dat -ooniprobe.conf +./ooniprobe.conf diff --git a/ooniprobe.conf b/ooniprobe.conf deleted file mode 100644 index ed77dfe..0000000 --- a/ooniprobe.conf +++ /dev/null @@ -1,38 +0,0 @@ -# This is the configuration file for OONIProbe -# This file follows the YAML markup format: http://yaml.org/spec/1.2/spec.html -# Keep in mind that indentation matters. - -basic: - # Where OONIProbe should be writing it's log file - logfile: ooniprobe.log -privacy: - # Should we include the IP address of the probe in the report? - includeip: false - # Should we include the ASN of the probe in the report? - includeasn: false - # Should we include the ASN of the probe in the report? - includecountry: false - # Should we include the ASN of the probe in the report? - includecity: false - # Should we collect a full packet capture on the client? - includepcap: false -advanced: - # XXX change this to point to the directory where you have stored the GeoIP - # database file. This should be the directory in which OONI is installed - # /path/to/ooni-probe/data/ - geoip_data_dir: /usr/share/GeoIP/ - debug: true - 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 orport. - start_tor: true -tor: - #socks_port: 9050 - #control_port: 9051 - # Specify the absolute path to the Tor bridges to use for testing - bridges: bridges.list - diff --git a/ooniprobe.conf.sample b/ooniprobe.conf.sample index a032c0c..551e4f0 100644 --- a/ooniprobe.conf.sample +++ b/ooniprobe.conf.sample @@ -22,13 +22,14 @@ advanced: # /path/to/ooni-probe/data/ geoip_data_dir: /usr/share/GeoIP/ debug: true - threadpool_size: 10 tor_binary: '/usr/sbin/tor' # For auto detection interface: auto # Of specify a specific interface #interface: wlan0 - start_tor: true + # If you do not specify start_tor, you will have to have Tor running and + # explicitly set the control port and orport. + start_tor: false tor: #socks_port: 9050 #control_port: 9051