[or-cvs] r20684: {torflow} Patch from jn to clean up directory paths and READMEs. (in torflow/trunk: . NetworkScanners/ExitAuthority)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-09-28 19:37:15 -0400 (Mon, 28 Sep 2009)
New Revision: 20684

Modified:
   torflow/trunk/NetworkScanners/ExitAuthority/README.ExitScanning
   torflow/trunk/NetworkScanners/ExitAuthority/libsoat.py
   torflow/trunk/NetworkScanners/ExitAuthority/soat.py
   torflow/trunk/README
Log:

Patch from jn to clean up directory paths and READMEs.



Modified: torflow/trunk/NetworkScanners/ExitAuthority/README.ExitScanning
===================================================================
--- torflow/trunk/NetworkScanners/ExitAuthority/README.ExitScanning	2009-09-28 15:50:33 UTC (rev 20683)
+++ torflow/trunk/NetworkScanners/ExitAuthority/README.ExitScanning	2009-09-28 23:37:15 UTC (rev 20684)
@@ -17,6 +17,8 @@
 Python 2.4+
 Tor 0.2.1.13 (r18556 or later)
 py-openssl/pyOpenSSL
+python-sqlalchemy
+python-elixir
 Bonus: Secondary external IP address
 
 Having a second external IP address will allow your scanner to filter

Modified: torflow/trunk/NetworkScanners/ExitAuthority/libsoat.py
===================================================================
--- torflow/trunk/NetworkScanners/ExitAuthority/libsoat.py	2009-09-28 15:50:33 UTC (rev 20683)
+++ torflow/trunk/NetworkScanners/ExitAuthority/libsoat.py	2009-09-28 23:37:15 UTC (rev 20684)
@@ -19,7 +19,7 @@
 
 import sets
 from sets import Set
-from soat_config import *
+from soat_config_real import *
 
 sys.path.append("../../")
 from TorCtl.TorUtil import *

Modified: torflow/trunk/NetworkScanners/ExitAuthority/soat.py
===================================================================
--- torflow/trunk/NetworkScanners/ExitAuthority/soat.py	2009-09-28 15:50:33 UTC (rev 20683)
+++ torflow/trunk/NetworkScanners/ExitAuthority/soat.py	2009-09-28 23:37:15 UTC (rev 20684)
@@ -61,7 +61,7 @@
 import OpenSSL
 from OpenSSL import *
 
-from soat_config import *
+from soat_config_real import *
 
 
 sys.path.append("../libs/")
@@ -2666,7 +2666,7 @@
   try:
     global scanhdlr
     (c,scanhdlr) = setup_handler(data_dir,
-                                 data_dir+"tor-data/control_auth_cookie")
+                                 data_dir+"tor/control_auth_cookie")
   except Exception, e:
     traceback.print_exc()
     plog("WARN", "Can't connect to Tor: "+str(e))

Modified: torflow/trunk/README
===================================================================
--- torflow/trunk/README	2009-09-28 15:50:33 UTC (rev 20683)
+++ torflow/trunk/README	2009-09-28 23:37:15 UTC (rev 20684)
@@ -56,7 +56,7 @@
 the requested content for several protocols. See the soat README for
 details:
 
-# cd NetworkScanners ; cat README.ExitScanning
+# cd NetworkScanners ; cat ExitAuthority/README.ExitScanning
 
 Important note: soat requires the pyopenssl python module to run.
 You can check if pyopenssl package is available for your distribution