From 2f7f8f1cf0b28bf16daecde6f05ff1a4b6cedd5f Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Fri, 29 Sep 2017 21:35:26 -0700 Subject: [PATCH] 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. --- zproject/settings.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/zproject/settings.py b/zproject/settings.py index cc3c629e6b..75c432a849 100644 --- a/zproject/settings.py +++ b/zproject/settings.py @@ -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')