[tor-commits] [bridgedb/develop] Add @riseup.net to EMAIL_DOMAIN[S|_RULES|_MAP] settings.

[isis at torproject.org]

commit 03f006a2a7662d03ffced6fc8e90ae711edefcbc
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sat Mar 29 07:51:32 2014 +0000

    Add @riseup.net to EMAIL_DOMAIN[S|_RULES|_MAP] settings.
---
 bridgedb.conf |   18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/bridgedb.conf b/bridgedb.conf
index 9ea28cb..28c98b4 100644
--- a/bridgedb.conf
+++ b/bridgedb.conf
@@ -295,11 +295,16 @@ EMAIL_SMTP_PORT = 25
 EMAIL_USERNAME = "bridges"
 
 # Canonical versions of domains that we will reply to.
-EMAIL_DOMAINS = ["gmail.com", "yahoo.com"]
+EMAIL_DOMAINS = ["gmail.com", "yahoo.com", "riseup.net"]
 
 # Map from unofficial domain to canonical domain.
-EMAIL_DOMAIN_MAP = {"mail.google.com": "gmail.com",
-                    "googlemail.com": "gmail.com"}
+EMAIL_DOMAIN_MAP = {
+    "mail.google.com": "gmail.com",
+    "googlemail.com": "gmail.com",
+    "mail.riseup.net": "riseup.net",
+    "fulvetta.riseup.net": "riseup.net",
+    "mx1.riseup.net": "riseup.net",
+}
 
 # Map from canonical domain to list of options for that domain.  Recognized
 # options are:
@@ -308,8 +313,11 @@ EMAIL_DOMAIN_MAP = {"mail.google.com": "gmail.com",
 #        with the value "pass", then drop the message.
 #
 # Note that unrecognized options are ignored; be sure to spell them right!
-EMAIL_DOMAIN_RULES = {'gmail.com': ["ignore_dots", "dkim"],
-                      'yahoo.com': ["dkim"]}
+EMAIL_DOMAIN_RULES = {
+    'gmail.com': ["ignore_dots", "dkim"],
+    'yahoo.com': ["dkim"],
+    'riseup.net': ["ignore_dots"]
+}
 
 # A mapping of whitelisted email addresses to GnuPG key fingerprints:
 EMAIL_WHITELIST = {}