commit 220c699d52620a4dee887ccc8438548df10960cd Author: Arturo Filastò arturo@filasto.net Date: Mon Jul 25 16:07:08 2016 +0200

Delete dead code --- ooni/nodes.conf | 53 ----------------------------------------------------- ooni/oonid.py | 15 --------------- 2 files changed, 68 deletions(-)

diff --git a/ooni/nodes.conf b/ooni/nodes.conf deleted file mode 100644 index 4d14be1..0000000 --- a/ooni/nodes.conf +++ /dev/null @@ -1,53 +0,0 @@ -[control] -# Specify in the list of network nodes to -# be used as control nodes -[[node1]] -address = socks4a://user:password@192.0.2.1 - -[[node2]] -address = socks5://user:password@192.0.2.2 - -[[node3]] -address = ssh://user:password@192.0.2.3 - - -[experiment] -# Specify the list of experiment nodes to -# be used for running tests. -[[countryA]] -address = socks4a://user:password@192.0.2.1 -family = china - -[[countryA1]] -address = socks5://user:password@192.0.2.2 -family = china - -[[countryA2]] -address = ssh://user:password@192.0.2.3 -family = italy - -[operators] -# Specify the list of operator nodes. These are -# the ones capable of accepting bundles of units -# of work and scheduling work to experiment nodes. -[[Local box]] -address = localhost -capacity = 0.2 - -[[Planetlab node]] -address = ssh://user:password@192.0.2.3 -rsakey = ~/.ssh/id_rsa -other = -# Specify an float between 0 and 1 to how much -# work this operator node should support. -capacity = 0.4 - -[[M-Lab server]] -address = ssh://user:password@192.0.2.3 -capacity = 0.5 - - - - - - diff --git a/ooni/oonid.py b/ooni/oonid.py deleted file mode 100644 index c04cadc..0000000 --- a/ooni/oonid.py +++ /dev/null @@ -1,15 +0,0 @@ -from twisted.application import service, internet - -from ooni.settings import config -from ooni.api.spec import oonidApplication -from ooni.director import Director - -def getOonid(): - director = Director() - director.start() - oonidApplication.director = director - return internet.TCPServer(int(config.advanced.oonid_api_port), oonidApplication) - -application = service.Application("ooniprobe") -service = getOonid() -service.setServiceParent(application)