Merge "One does not simply send emails to gvincent *scnr*"
This commit is contained in:
commit
ed0247dabe
|
@ -2,6 +2,7 @@ import logging
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
from django.conf import global_settings
|
||||||
from django.utils.crypto import get_random_string
|
from django.utils.crypto import get_random_string
|
||||||
from envparse import env
|
from envparse import env
|
||||||
|
|
||||||
|
@ -182,7 +183,7 @@ if DEBUG:
|
||||||
EMAIL_BACKEND = os.getenv('EMAIL_BACKEND', 'django.core.mail.backends.console.EmailBackend')
|
EMAIL_BACKEND = os.getenv('EMAIL_BACKEND', 'django.core.mail.backends.console.EmailBackend')
|
||||||
else:
|
else:
|
||||||
EMAIL_BACKEND = os.getenv('EMAIL_BACKEND', 'django.core.mail.backends.smtp.EmailBackend')
|
EMAIL_BACKEND = os.getenv('EMAIL_BACKEND', 'django.core.mail.backends.smtp.EmailBackend')
|
||||||
DEFAULT_FROM_EMAIL = os.getenv('DEFAULT_FROM_EMAIL', 'gvincent@redhat.com')
|
DEFAULT_FROM_EMAIL = os.getenv('DEFAULT_FROM_EMAIL', global_settings.DEFAULT_FROM_EMAIL)
|
||||||
EMAIL_HOST = os.getenv('EMAIL_HOST', 'localhost')
|
EMAIL_HOST = os.getenv('EMAIL_HOST', 'localhost')
|
||||||
EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER', '')
|
EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER', '')
|
||||||
EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD', '')
|
EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD', '')
|
||||||
|
|
Loading…
Reference in New Issue