Move email_gateway_password to zulip-secrets.conf.

This commit is contained in:
Tim Abbott 2015-11-23 13:20:32 -08:00
parent 8b1d7d7018
commit af8d75332c
2 changed files with 5 additions and 3 deletions

View File

@ -205,11 +205,11 @@ EMAIL_GATEWAY_PATTERN = ""
# which will check that inbox and batch-process any new messages.
#
# You will need to configure authentication for the email mirror
# command to access the IMAP mailbox below.
# command to access the IMAP mailbox below and in zulip-secrets.conf.
#
# The IMAP login and password
# The IMAP login; username here and password as email_gateway_login in
# zulip-secrets.conf.
EMAIL_GATEWAY_LOGIN = ""
EMAIL_GATEWAY_PASSWORD = ""
# The IMAP server & port to connect to
EMAIL_GATEWAY_IMAP_SERVER = ""
EMAIL_GATEWAY_IMAP_PORT = 993

View File

@ -929,6 +929,8 @@ else:
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
EMAIL_HOST_PASSWORD = get_secret('email_password')
if "EMAIL_GATEWAY_PASSWORD" not in vars():
EMAIL_GATEWAY_PASSWORD = get_secret('email_gateway_password')
########################################################################
# MISC SETTINGS