commit 6217c6533f4977024e3d2d23168e05f8c06ae3f3 Author: Arturo Filastò arturo@filasto.net Date: Tue Jul 12 12:22:24 2016 +0200
Add configs for lepidopter update --- data/configs/lepidopter-ooniprobe.conf | 75 +++++++++++++++++++++++++++++++++ data/configs/lepidopter-oonireport.conf | 69 ++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+)
diff --git a/data/configs/lepidopter-ooniprobe.conf b/data/configs/lepidopter-ooniprobe.conf new file mode 100644 index 0000000..5c8ba40 --- /dev/null +++ b/data/configs/lepidopter-ooniprobe.conf @@ -0,0 +1,75 @@ +# 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: /var/log/ooni/ooniprobe.log + # in the future we will support loglevels + loglevel: WARNING +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: true + # Should we include the country as reported by GeoIP in the report? + includecountry: true + # Should we include the city as reported by GeoIP in the report? + includecity: false + # Should we collect a full packet capture on the client? + includepcap: false +reports: + # Should we place a unique ID inside of every report + unique_id: true + # This is a prefix for each packet capture file (.pcap) per test: + pcap: null + collector: null +advanced: + geoip_data_dir: /usr/share/GeoIP + debug: false + # enable if auto detection fails + #tor_binary: /usr/sbin/tor + #obfsproxy_binary: /usr/bin/obfsproxy + # 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 + # After how many seconds we should give up on a particular measurement + measurement_timeout: 120 + # After how many retries we should give up on a measurement + measurement_retries: 2 + # How many measurements to perform concurrently + measurement_concurrency: 4 + # After how may seconds we should give up reporting + reporting_timeout: 360 + # After how many retries to give up on reporting + reporting_retries: 5 + # How many reports to perform concurrently + reporting_concurrency: 7 + oonid_api_port: 8042 + report_log_file: null + inputs_dir: null + decks_dir: null +tor: + #socks_port: 8801 + #control_port: 8802 + # Specify the absolute path to the Tor bridges to use for testing + #bridges: bridges.list + # Specify path of the tor datadirectory. + # This should be set to something to avoid having Tor download each time + # the descriptors and consensus data. + data_dir: /opt/ooni/tor_data_dir +torrc: + #HTTPProxy: host:port + #HTTPProxyAuthenticator: user:password + #HTTPSProxy: host:port + #HTTPSProxyAuthenticator: user:password + # Uncomment following 5 lines to connect via meek pluggable transport in tor + #UseBridges: 1 + #Bridge: + #- "meek_lite 0.0.2.0:1 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com" + #- "meek_lite 0.0.2.0:2 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com" + #ClientTransportPlugin: "meek_lite exec /usr/bin/obfs4proxy" diff --git a/data/configs/lepidopter-oonireport.conf b/data/configs/lepidopter-oonireport.conf new file mode 100644 index 0000000..8ea3ccc --- /dev/null +++ b/data/configs/lepidopter-oonireport.conf @@ -0,0 +1,69 @@ +# 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: /var/log/ooni/oonireport.log + # in the future we will support loglevels + loglevel: WARNING +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: true + # Should we include the country as reported by GeoIP in the report? + includecountry: true + # Should we include the city as reported by GeoIP in the report? + includecity: false + # Should we collect a full packet capture on the client? + includepcap: false +reports: + # Should we place a unique ID inside of every report + unique_id: true + # This is a prefix for each packet capture file (.pcap) per test: + pcap: null + collector: null +advanced: + geoip_data_dir: /usr/share/GeoIP + debug: false + # enable if auto detection fails + #tor_binary: /usr/sbin/tor + #obfsproxy_binary: /usr/bin/obfsproxy + # 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: false + # After how many seconds we should give up on a particular measurement + measurement_timeout: 120 + # After how many retries we should give up on a measurement + measurement_retries: 2 + # How many measurements to perform concurrently + measurement_concurrency: 4 + # After how may seconds we should give up reporting + reporting_timeout: 360 + # After how many retries to give up on reporting + reporting_retries: 5 + # How many reports to perform concurrently + reporting_concurrency: 7 + oonid_api_port: 8042 + report_log_file: null + inputs_dir: null + decks_dir: null +tor: + socks_port: 9050 + #control_port: 8802 + # Specify the absolute path to the Tor bridges to use for testing + #bridges: bridges.list + # Specify path of the tor datadirectory. + # This should be set to something to avoid having Tor download each time + # the descriptors and consensus data. + #data_dir: ~/.tor/ + torrc: + #HTTPProxy: host:port + #HTTPProxyAuthenticator: user:password + #HTTPSProxy: host:port + #HTTPSProxyAuthenticator: user:password
tor-commits@lists.torproject.org