Delete unneeded files and reorganise existing files

ooni · Apr 3, 2015 · 5004d8e · 5004d8e
1 parent 4fe2884
commit 5004d8e
Show file tree

Hide file tree

Showing 26 changed files with 19 additions and 168 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/README.rst b/README.rst
@@ -126,7 +126,7 @@ without installing it is supported with the following commands::
 
     git clone https://git.torproject.org/ooni-probe.git
     cd ooni-probe
-    ./setup-dependencies.sh
+    ./scripts/setup-dependencies.sh
     python setup.py install
 
 OSX

diff --git a/apt.key b/apt.key
diff --git a/ooniprobe-dev → bin/ooniprobe-dev b/ooniprobe-dev → bin/ooniprobe-dev
diff --git a/debian/README b/debian/README
diff --git a/debian/changelog b/debian/changelog
diff --git a/debian/compat b/debian/compat
diff --git a/debian/control b/debian/control
diff --git a/debian/copyright b/debian/copyright
diff --git a/debian/rules b/debian/rules
diff --git a/debian/source/format b/debian/source/format
diff --git a/fabfile.py → scripts/fabfile.py b/fabfile.py → scripts/fabfile.py
diff --git a/setup-dependencies.sh → scripts/setup-dependencies.sh b/setup-dependencies.sh → scripts/setup-dependencies.sh
diff --git a/example_inputs/README → var/example_inputs/README b/example_inputs/README → var/example_inputs/README
diff --git a/var/example_inputs/alexa-head.txt b/var/example_inputs/alexa-head.txt
@@ -0,0 +1,10 @@
+http://google.com/
+http://facebook.com/
+http://youtube.com/
+http://yahoo.com/
+http://baidu.com/
+http://wikipedia.org/
+http://live.com/
+http://twitter.com/
+http://qq.com/
+http://amazon.com/
diff --git a/example_inputs/alexa-top-1k.txt → var/example_inputs/alexa-top-1k.txt b/example_inputs/alexa-top-1k.txt → var/example_inputs/alexa-top-1k.txt
diff --git a/var/example_inputs/bad_input.txt b/var/example_inputs/bad_input.txt
@@ -0,0 +1 @@
+http://zimbio.com/
diff --git a/var/example_inputs/bridges.txt b/var/example_inputs/bridges.txt
@@ -0,0 +1,4 @@
+obfs4 178.209.52.110:443 67E72FF33D7D41BF11C569646A0A7B4B188340DF cert=Z+cv8z19Qb8RxWlkagp7SxiDQN++b7D2Tntowhf+j4D15/kLuj3EoSSGvuREGPc3h60Ofw iat-mode=0
+obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0
+obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239
+obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED
diff --git a/example_inputs/daph3_yaml_file.txt → var/example_inputs/daph3_yaml_file.txt b/example_inputs/daph3_yaml_file.txt → var/example_inputs/daph3_yaml_file.txt
diff --git a/example_inputs/dns_tamper_file.txt → var/example_inputs/dns_tamper_file.txt b/example_inputs/dns_tamper_file.txt → var/example_inputs/dns_tamper_file.txt
diff --git a/example_inputs/dns_tamper_test_resolvers.txt → ...mple_inputs/dns_tamper_test_resolvers.txt b/example_inputs/dns_tamper_test_resolvers.txt → ...mple_inputs/dns_tamper_test_resolvers.txt
diff --git a/var/example_inputs/domains.txt b/var/example_inputs/domains.txt
@@ -0,0 +1,3 @@
+www.twitter.com
+facebook.com
+youtube.com
diff --git a/example_inputs/http_host_file.txt → var/example_inputs/http_host_file.txt b/example_inputs/http_host_file.txt → var/example_inputs/http_host_file.txt
diff --git a/example_inputs/keyword_filtering_file.txt → ...example_inputs/keyword_filtering_file.txt b/example_inputs/keyword_filtering_file.txt → ...example_inputs/keyword_filtering_file.txt
diff --git a/example_inputs/tcpconnect_host_file.txt → var/example_inputs/tcpconnect_host_file.txt b/example_inputs/tcpconnect_host_file.txt → var/example_inputs/tcpconnect_host_file.txt
diff --git a/example_inputs/url_lists_file.txt → var/example_inputs/url_lists_file.txt b/example_inputs/url_lists_file.txt → var/example_inputs/url_lists_file.txt