Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

settings: Clean up EMAIL_GATEWAY_PASSWORD. 

We haven't ever recommended that people put EMAIL_GATEWAY_PASSWORD in
their /etc/zulip/settings.py, and so this is probably just
ultra-legacy code.
This commit is contained in:
Tim Abbott 2017-09-29 21:35:26 -07:00
parent 94ba678f5b
commit 2f7f8f1cf0
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zproject/settings.py
View File

@ -191,7 +191,6 @@ DEFAULT_SETTINGS.update({
# These are undocumented, and we don't set them in dev_settings.py
# or test_settings.py , either.
# TODO: document them.
'EMAIL_GATEWAY_PASSWORD': None,
'EMAIL_GATEWAY_EXTRA_PATTERN_HACK': None,
'STAGING': False,
'DATA_UPLOAD_MAX_MEMORY_SIZE': 25 * 1024 * 1024,
@ -1293,8 +1292,7 @@ else:
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
EMAIL_HOST_PASSWORD = get_secret('email_password')
if EMAIL_GATEWAY_PASSWORD is None:
EMAIL_GATEWAY_PASSWORD = get_secret('email_gateway_password')
EMAIL_GATEWAY_PASSWORD = get_secret('email_gateway_password')
if vars().get("AUTH_LDAP_BIND_PASSWORD") is None:
AUTH_LDAP_BIND_PASSWORD = get_secret('auth_ldap_bind_password')