Commit 1b1cc253 authored by aagbsn's avatar aagbsn
Browse files

5258 - make SMTP server configurable

parent 08abccfc
......@@ -102,6 +102,8 @@ EMAIL_SHARE=10
# the MAIL FROM header in outgoing SMTP.
EMAIL_FROM_ADDR = "bridges@torproject.org"
EMAIL_SMTP_FROM_ADDR = "bridges@torproject.org"
EMAIL_SMTP_HOST = "127.0.0.1"
EMAIL_SMTP_PORT = 25
# Reject any RCPT TO lines that aren't to this user.
EMAIL_USERNAME = "bridges"
......
......@@ -94,6 +94,8 @@ CONFIG = Conf(
EMAIL_PORT=6725,
EMAIL_N_BRIDGES_PER_ANSWER=2,
EMAIL_INCLUDE_FINGERPRINTS = False,
EMAIL_SMTP_HOST="127.0.0.1",
EMAIL_SMTP_PORT=25,
RESERVED_SHARE=2,
......
......@@ -514,9 +514,8 @@ class MailContext:
# Reject any mail longer than this.
self.maximumSize = 32*1024
# Use this server for outgoing mail.
# self.smtpServer = "127.0.0.1" # XXX should make configurable
self.smtpServer = "172.22.121.1"
self.smtpPort = 25
self.smtpServer = (cfg.EMAIL_SMTP_HOST or "127.0.0.1")
self.smtpPort = (cfg.EMAIL_SMTP_PORT or 25)
# Use this address in the MAIL FROM line for outgoing mail.
self.smtpFromAddr = (cfg.EMAIL_SMTP_FROM_ADDR or
"bridges@torproject.org")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment