branding: make the domain name regex configurable

This implements Dan's 2012 TODO: configurable domain/regex somewhere?

2 files changed, 4 insertions, 2 deletions

diff --git a/devel/utils.py b/devel/utils.py
index bd57def9..3326987a 100644
--- a/devel/utils.py
+++ b/devel/utils.py
@@ -1,5 +1,6 @@
 import re
 
+from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
 from django.db import connection
@@ -78,9 +79,8 @@ class UserFinder(object):
         if email and '@' in email:
             # split email addr at '@' symbol, ensure domain matches
             # or is a subdomain of archlinux.org
-            # TODO: configurable domain/regex somewhere?
             username, domain = email.split('@', 1)
-            if re.match(r'^(.+\.)?archlinux.org$', domain):
+            if re.match(settings.DOMAIN_RE, domain):
                 return User.objects.get(username=username)
         return None
 
diff --git a/settings.py b/settings.py
index 4393e693..31070d02 100644
--- a/settings.py
+++ b/settings.py
@@ -172,6 +172,8 @@ TORRENT_TRACKERS = (
     'http://tracker.archlinux.org:6969/announce',
 )
 
+DOMAIN_RE = r'^(.+\.)?archlinux.org$'
+
 # Shorten some names just a bit
 COUNTRIES_OVERRIDE = {
     'GB': 'United Kingdom',