christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2025-01-07 16:04:02 +00:00
Code Issues Releases Activity

Make all outside email go from the same address

Browse Source 
For most admins, it doesn't make much sense to send emails from many
email addresses. Here, we set a sane default that can be easily
overridden.
This commit is contained in:
Régis Behmo 2018-09-05 12:24:07 +02:00
parent 3587a187cd
commit f76a4feb53
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/openedx/templates/cms.env.json.templ
View File

@ -12,6 +12,7 @@
"CMS_ROOT_URL": "{{ "https" if ACTIVATE_HTTPS else "http" }}://{{ CMS_HOST }}", "CMS_ROOT_URL": "{{ "https" if ACTIVATE_HTTPS else "http" }}://{{ CMS_HOST }}",
"CMS_BASE": "{{ CMS_HOST }}", "CMS_BASE": "{{ CMS_HOST }}",
"LMS_BASE": "{{ LMS_HOST }}", "LMS_BASE": "{{ LMS_HOST }}",
"CONTACT_EMAIL": "{{ CONTACT_EMAIL }}",
"CELERY_BROKER_HOSTNAME": "rabbitmq", "CELERY_BROKER_HOSTNAME": "rabbitmq",
"CELERY_BROKER_TRANSPORT": "amqp", "CELERY_BROKER_TRANSPORT": "amqp",
"MEDIA_ROOT": "/openedx/data/uploads/", "MEDIA_ROOT": "/openedx/data/uploads/",

1
config/openedx/templates/lms.env.json.templ
View File

@ -12,6 +12,7 @@
"CMS_ROOT_URL": "{{ "https" if ACTIVATE_HTTPS else "http" }}://{{ CMS_HOST }}", "CMS_ROOT_URL": "{{ "https" if ACTIVATE_HTTPS else "http" }}://{{ CMS_HOST }}",
"CMS_BASE": "{{ CMS_HOST }}", "CMS_BASE": "{{ CMS_HOST }}",
"LMS_BASE": "{{ LMS_HOST }}", "LMS_BASE": "{{ LMS_HOST }}",
"CONTACT_EMAIL": "{{ CONTACT_EMAIL }}",
"CELERY_BROKER_HOSTNAME": "rabbitmq", "CELERY_BROKER_HOSTNAME": "rabbitmq",
"CELERY_BROKER_TRANSPORT": "amqp", "CELERY_BROKER_TRANSPORT": "amqp",
"COMMENTS_SERVICE_URL": "http://forum:4567", "COMMENTS_SERVICE_URL": "http://forum:4567",

6
config/openedx/universal/cms/production.py
View File

@ -21,6 +21,6 @@ ALLOWED_HOSTS = [
'127.0.0.1:8001', 'localhost:8001', '127.0.0.1:8001', 'localhost:8001',
] ]
DEFAULT_FROM_EMAIL = 'registration@' + ENV_TOKENS['LMS_BASE'] DEFAULT_FROM_EMAIL = ENV_TOKENS['CONTACT_EMAIL']
DEFAULT_FEEDBACK_EMAIL = 'feedback@' + ENV_TOKENS['LMS_BASE'] DEFAULT_FEEDBACK_EMAIL = ENV_TOKENS['CONTACT_EMAIL']
SERVER_EMAIL = 'devops@' + ENV_TOKENS['LMS_BASE'] SERVER_EMAIL = ENV_TOKENS['CONTACT_EMAIL']

22
config/openedx/universal/lms/production.py
View File

@ -28,15 +28,15 @@ ALLOWED_HOSTS = [
'127.0.0.1:8000', 'localhost:8000', '127.0.0.1:8000', 'localhost:8000',
] ]
DEFAULT_FROM_EMAIL = 'registration@' + ENV_TOKENS['LMS_BASE'] DEFAULT_FROM_EMAIL = ENV_TOKENS['CONTACT_EMAIL']
DEFAULT_FEEDBACK_EMAIL = 'feedback@' + ENV_TOKENS['LMS_BASE'] DEFAULT_FEEDBACK_EMAIL = ENV_TOKENS['CONTACT_EMAIL']
SERVER_EMAIL = 'devops@' + ENV_TOKENS['LMS_BASE'] SERVER_EMAIL = ENV_TOKENS['CONTACT_EMAIL']
TECH_SUPPORT_EMAIL = 'technical@' + ENV_TOKENS['LMS_BASE'] TECH_SUPPORT_EMAIL = ENV_TOKENS['CONTACT_EMAIL']
CONTACT_EMAIL = 'info@' + ENV_TOKENS['LMS_BASE'] CONTACT_EMAIL = ENV_TOKENS['CONTACT_EMAIL']
BUGS_EMAIL = 'bugs@' + ENV_TOKENS['LMS_BASE'] BUGS_EMAIL = ENV_TOKENS['CONTACT_EMAIL']
UNIVERSITY_EMAIL = 'university@' + ENV_TOKENS['LMS_BASE'] UNIVERSITY_EMAIL = ENV_TOKENS['CONTACT_EMAIL']
PRESS_EMAIL = 'press@' + ENV_TOKENS['LMS_BASE'] PRESS_EMAIL = ENV_TOKENS['CONTACT_EMAIL']
PAYMENT_SUPPORT_EMAIL = 'payment@' + ENV_TOKENS['LMS_BASE'] PAYMENT_SUPPORT_EMAIL = ENV_TOKENS['CONTACT_EMAIL']
BULK_EMAIL_DEFAULT_FROM_EMAIL = 'no-reply@' + ENV_TOKENS['LMS_BASE'] BULK_EMAIL_DEFAULT_FROM_EMAIL = 'no-reply@' + ENV_TOKENS['LMS_BASE']
API_ACCESS_MANAGER_EMAIL = 'api-access@' + ENV_TOKENS['LMS_BASE'] API_ACCESS_MANAGER_EMAIL = ENV_TOKENS['CONTACT_EMAIL']
API_ACCESS_FROM_EMAIL = 'api-requests@' + ENV_TOKENS['LMS_BASE'] API_ACCESS_FROM_EMAIL = ENV_TOKENS['CONTACT_EMAIL']

2
configurator/bin/configure.py
View File

@ -96,6 +96,8 @@ def interactive(args):
'CMS_HOST', "Your website domain name for teachers (CMS).", 'studio.myopenedx.com' 'CMS_HOST', "Your website domain name for teachers (CMS).", 'studio.myopenedx.com'
).add( ).add(
'PLATFORM_NAME', "Platform name/title", "My Open edX" 'PLATFORM_NAME', "Platform name/title", "My Open edX"
).add(
'CONTACT_EMAIL', "Public contact email address", 'contact@' + configurator.get('LMS_HOST')
).add( ).add(
'SECRET_KEY', "", random_string(24) 'SECRET_KEY', "", random_string(24)
).add( ).add(