commit 45db027b45d71f926dc59237c1b4d7bdd1e31739 Author: aagbsn aagbsn@extc.org Date: Thu Jun 16 23:02:42 2011 -0700
add sample db_url strings --- NetworkScanners/BwAuthority/bwauthority_child.py | 1 + .../BwAuthority/data/scanner.1/bwauthority.cfg | 4 +++- .../BwAuthority/data/scanner.2/bwauthority.cfg | 4 +++- .../BwAuthority/data/scanner.3/bwauthority.cfg | 2 ++ .../BwAuthority/data/scanner.4/bwauthority.cfg | 2 ++ 5 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/NetworkScanners/BwAuthority/bwauthority_child.py b/NetworkScanners/BwAuthority/bwauthority_child.py index 6f61c63..4d968ac 100755 --- a/NetworkScanners/BwAuthority/bwauthority_child.py +++ b/NetworkScanners/BwAuthority/bwauthority_child.py @@ -287,6 +287,7 @@ def main(argv):
if db_url: hdlr.attach_sql_listener(db_url) + sql_file = None else: plog("INFO", "db_url not found in config. Defaulting to sqlite") sql_file = os.getcwd()+'/'+out_dir+'/bwauthority.sqlite' diff --git a/NetworkScanners/BwAuthority/data/scanner.1/bwauthority.cfg b/NetworkScanners/BwAuthority/data/scanner.1/bwauthority.cfg index bd3a0ca..8f9394f 100644 --- a/NetworkScanners/BwAuthority/data/scanner.1/bwauthority.cfg +++ b/NetworkScanners/BwAuthority/data/scanner.1/bwauthority.cfg @@ -13,7 +13,9 @@ meta_port = 9112 out_dir = ./data/scanner.1/scan-data pid_file = ./data/scanner.1/bwauthority.pid # if db_url is unset bwauthority will default to sqlite -db_url = +db_url = +#db_url = mysql+mysqldb://bwscanner:password@127.0.0.1/BwScan1 +#db_url = postgresql://bwscanner:password@127.0.0.1/BwScan1 tor_dir = ./data/tor start_pct = 0 stop_pct = 12 diff --git a/NetworkScanners/BwAuthority/data/scanner.2/bwauthority.cfg b/NetworkScanners/BwAuthority/data/scanner.2/bwauthority.cfg index ea2472d..42a6a5d 100644 --- a/NetworkScanners/BwAuthority/data/scanner.2/bwauthority.cfg +++ b/NetworkScanners/BwAuthority/data/scanner.2/bwauthority.cfg @@ -13,7 +13,9 @@ meta_port = 9112 out_dir = ./data/scanner.2/scan-data pid_file = ./data/scanner.2/bwauthority.pid # if db_url is unset bwauthority will default to sqlite -db_url = +db_url = +#db_url = mysql+mysqldb://bwscanner:password@127.0.0.1/BwScan1 +#db_url = postgresql://bwscanner:password@127.0.0.1/BwScan1 tor_dir = ./data/tor start_pct = 12 stop_pct = 35 diff --git a/NetworkScanners/BwAuthority/data/scanner.3/bwauthority.cfg b/NetworkScanners/BwAuthority/data/scanner.3/bwauthority.cfg index 526a912..a2ea7ac 100644 --- a/NetworkScanners/BwAuthority/data/scanner.3/bwauthority.cfg +++ b/NetworkScanners/BwAuthority/data/scanner.3/bwauthority.cfg @@ -14,6 +14,8 @@ out_dir = ./data/scanner.3/scan-data pid_file = ./data/scanner.3/bwauthority.pid # if db_url is unset bwauthority will default to sqlite db_url = +#db_url = mysql+mysqldb://bwscanner:password@127.0.0.1/BwScan1 +#db_url = postgresql://bwscanner:password@127.0.0.1/BwScan1 tor_dir = ./data/tor start_pct =35 stop_pct = 60 diff --git a/NetworkScanners/BwAuthority/data/scanner.4/bwauthority.cfg b/NetworkScanners/BwAuthority/data/scanner.4/bwauthority.cfg index 5a7c7a7..20ebe5a 100644 --- a/NetworkScanners/BwAuthority/data/scanner.4/bwauthority.cfg +++ b/NetworkScanners/BwAuthority/data/scanner.4/bwauthority.cfg @@ -14,6 +14,8 @@ out_dir = ./data/scanner.4/scan-data pid_file = ./data/scanner.4/bwauthority.pid # if db_url is unset bwauthority will default to sqlite db_url = +#db_url = mysql+mysqldb://bwscanner:password@127.0.0.1/BwScan1 +#db_url = postgresql://bwscanner:password@127.0.0.1/BwScan1 tor_dir = ./data/tor start_pct =60 stop_pct = 100
tor-commits@lists.torproject.org