paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Clean up EMAIL_HOST documentation a bit.

Browse Source 
Gmail is a bad example for outbound email; use a generic example.

Also leave the `= None` default out of the config file, as it's
redundant with DEFAULT_SETTINGS in our internal settings.py ; and
explain in the latter why we don't mention the other SMTP settings.
This commit is contained in:
Greg Price
2018-01-24 14:53:06 -08:00
parent 68d5471045
commit 3230d35d7f
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zproject/prod_settings_template.py
View File

@@ -52,11 +52,10 @@ ZULIP_ADMINISTRATOR = 'zulip-admin@example.com'
# #
# A common problem is hosting provider firewalls that block outgoing SMTP traffic. # A common problem is hosting provider firewalls that block outgoing SMTP traffic.
# #
#EMAIL_HOST = 'smtp.gmail.com' #EMAIL_HOST = 'smtp.example.com'
#EMAIL_HOST_USER = '' #EMAIL_HOST_USER = ''
#EMAIL_PORT = 587 #EMAIL_PORT = 587
#EMAIL_USE_TLS = True #EMAIL_USE_TLS = True
EMAIL_HOST = None
## OPTIONAL SETTINGS ## OPTIONAL SETTINGS

6
zproject/settings.py
View File

@@ -119,10 +119,14 @@ DEFAULT_SETTINGS = {
'ALLOWED_HOSTS': [], 'ALLOWED_HOSTS': [],
# Basic email settings # Basic email settings
'EMAIL_HOST': None,
'NOREPLY_EMAIL_ADDRESS': "noreply@" + EXTERNAL_HOST.split(":")[0], 'NOREPLY_EMAIL_ADDRESS': "noreply@" + EXTERNAL_HOST.split(":")[0],
'PHYSICAL_ADDRESS': '', 'PHYSICAL_ADDRESS': '',
# SMTP settings
'EMAIL_HOST': None,
# Other settings, like EMAIL_HOST_USER, EMAIL_PORT, and EMAIL_USE_TLS,
# we leave up to Django's defaults.
# Google auth # Google auth
'GOOGLE_OAUTH2_CLIENT_ID': None, 'GOOGLE_OAUTH2_CLIENT_ID': None,