[tor-commits] [ooni-probe/develop] Move sample config file to data subdirectory

[isis at torproject.org]

commit 367e58128a9b7cb6c63897cfd24f6a246bcedd8a
Author: Arturo Filastò <art at fuffa.org>
Date:   Tue Apr 23 16:58:59 2013 +0200

    Move sample config file to data subdirectory
---
 data/ooniprobe.conf.sample |   56 ++++++++++++++++++++++++++++++++++++++++++++
 ooniprobe.conf.sample      |   56 --------------------------------------------
 2 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample
new file mode 100644
index 0000000..5528199
--- /dev/null
+++ b/data/ooniprobe.conf.sample
@@ -0,0 +1,56 @@
+# 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 country as reported by GeoIP in the report?
+    includecountry: false
+    # 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:
+    # This is a packet capture file (.pcap) to load as a test:
+    pcap: Null
+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 SOCKS port
+    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
+    measurement_retries: 2
+    # How many measurments to perform concurrently
+    measurement_concurrency: 100
+    # After how may seconds we should give up reporting
+    reporting_timeout: 30
+    # After how many retries to give up on reporting
+    reporting_retries: 3
+    # How many reports to perform concurrently
+    reporting_concurrency: 20
+tor:
+    #socks_port: 9050
+    #control_port: 9051
+    # 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/
diff --git a/ooniprobe.conf.sample b/ooniprobe.conf.sample
deleted file mode 100644
index 27a4fb3..0000000
--- a/ooniprobe.conf.sample
+++ /dev/null
@@ -1,56 +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 country as reported by GeoIP in the report?
-    includecountry: false
-    # 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:
-    # This is a packet capture file (.pcap) to load as a test:
-    pcap: Null
-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 SOCKS port
-    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
-    measurement_retries: 2
-    # How many measurments to perform concurrently
-    measurement_concurrency: 100
-    # After how may seconds we should give up reporting
-    reporting_timeout: 30
-    # After how many retries to give up on reporting
-    reporting_retries: 3
-    # How many reports to perform concurrently
-    reporting_concurrency: 20
-tor:
-    #socks_port: 9050
-    #control_port: 9051
-    # 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/