[tor-commits] [torflow/master] Clarify soat_config names for emailing results.

[mikeperry@xxxxxxxxxxxxxx]

commit 1ce6ee264dced96e452462ba839e8ce7393cdfcb
Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date:   Tue Sep 20 10:47:22 2011 -0700

    Clarify soat_config names for emailing results.
---
 NetworkScanners/ExitAuthority/snakeinspector.py |    2 +-
 NetworkScanners/ExitAuthority/soat_config.py    |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/NetworkScanners/ExitAuthority/snakeinspector.py b/NetworkScanners/ExitAuthority/snakeinspector.py
index b46f702..cf1edfe 100755
--- a/NetworkScanners/ExitAuthority/snakeinspector.py
+++ b/NetworkScanners/ExitAuthority/snakeinspector.py
@@ -265,7 +265,7 @@ def main(argv):
           text += traceback.format_exc()
         # TODO: Attach files? Or is that too much.. Maybe serve
         # them via http and include links?
-        send_mail(from_email, to_email, subject, text)
+        send_mail(mail_from_email, mail_to_email, subject, text)
 
 if __name__ == "__main__":
   main(sys.argv)
diff --git a/NetworkScanners/ExitAuthority/soat_config.py b/NetworkScanners/ExitAuthority/soat_config.py
index 99cd4ff..6beba50 100644
--- a/NetworkScanners/ExitAuthority/soat_config.py
+++ b/NetworkScanners/ExitAuthority/soat_config.py
@@ -43,10 +43,7 @@ max_content_size = 256*1024
 refetch_ip = None
 #refetch_ip = "4.4.4.4"
 
-# Email settings for email scans.
-from_email = "Tor Exit Scanner <noreply@xxxxxxxxxxxxxx>"
-to_email = ["Tor Exit Scanner List <flynn@xxxxxxxxxxxxxx>"]
-
+# Email settings for emailing scanned results:
 mail_server = "127.0.0.1"
 # Email authentication
 # If your smtp server requires a username and password, set
@@ -57,6 +54,8 @@ mail_user = "soat@xxxxxxxxxx"
 mail_password = "password"
 mail_tls = False # Requires Python >= 2.6
 mail_starttls = False
+mail_from_email = "Tor Exit Scanner <"+mail_user+">"
+mail_to_email = ["Tor Exit Scanner List <tor-exitscanner@xxxxxxxxxxxxxxxxxxxx>"]
 
 # What percentage of tested nodes must disagree with our local fetches before
 # we ignore the target site/url

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits