From 729070763f47c187358e0d1871c3a0960cf19668 Mon Sep 17 00:00:00 2001 From: David Ormsbee Date: Mon, 23 Jul 2012 23:43:34 -0400 Subject: [PATCH] Convert @mitx.mit.edu emails to @edx.org emails --- cms/envs/common.py | 6 +++--- lms/envs/common.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cms/envs/common.py b/cms/envs/common.py index 0196ddc9e5..896c4515a2 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -132,10 +132,10 @@ IGNORABLE_404_ENDS = ('favicon.ico') # Email EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' -DEFAULT_FROM_EMAIL = 'registration@mitx.mit.edu' -DEFAULT_FEEDBACK_EMAIL = 'feedback@mitx.mit.edu' +DEFAULT_FROM_EMAIL = 'registration@edx.org' +DEFAULT_FEEDBACK_EMAIL = 'feedback@edx.org' ADMINS = ( - ('MITx Admins', 'admin@mitx.mit.edu'), + ('edX Admins', 'admin@edx.org'), ) MANAGERS = ADMINS diff --git a/lms/envs/common.py b/lms/envs/common.py index f0571d19cf..3b005c5dbe 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -158,17 +158,17 @@ TEMPLATE_DEBUG = False # Site info SITE_ID = 1 -SITE_NAME = "localhost:8000" +SITE_NAME = "edx.org" HTTPS = 'on' ROOT_URLCONF = 'lms.urls' IGNORABLE_404_ENDS = ('favicon.ico') # Email EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' -DEFAULT_FROM_EMAIL = 'registration@mitx.mit.edu' -DEFAULT_FEEDBACK_EMAIL = 'feedback@mitx.mit.edu' +DEFAULT_FROM_EMAIL = 'registration@edx.org' +DEFAULT_FEEDBACK_EMAIL = 'feedback@edx.org' ADMINS = ( - ('MITx Admins', 'admin@mitx.mit.edu'), + ('edX Admins', 'admin@edx.org'), ) MANAGERS = ADMINS