From ca8187b8cf8f2468bb48d91992877be40de35e2c Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Fri, 1 Nov 2013 16:43:20 -0400 Subject: [PATCH] Email gateway bot variable name changed to EMAIL_GATEWAY_BOT (imported from commit 01c430bd9b916c9bb152ee821214495333f1d37e) --- zerver/management/commands/email-mirror.py | 2 +- zproject/settings.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zerver/management/commands/email-mirror.py b/zerver/management/commands/email-mirror.py index f62590fd47..bd902e0ae5 100755 --- a/zerver/management/commands/email-mirror.py +++ b/zerver/management/commands/email-mirror.py @@ -313,7 +313,7 @@ Run this command out of a cron job. """ def handle(self, **options): - if (not settings.EMAIL_GATEWAY_BOT_ZULIP_USER or not settings.EMAIL_GATEWAY_LOGIN or + if (not settings.EMAIL_GATEWAY_BOT or not settings.EMAIL_GATEWAY_LOGIN or not settings.EMAIL_GATEWAY_PASSWORD or not settings.EMAIL_GATEWAY_IMAP_SERVER or not settings.EMAIL_GATEWAY_IMAP_PORT or not settings.EMAIL_GATEWAY_IMAP_FOLDER or not email_gateway_user): diff --git a/zproject/settings.py b/zproject/settings.py index fcb240a8f3..1622d5957e 100644 --- a/zproject/settings.py +++ b/zproject/settings.py @@ -223,7 +223,7 @@ DEFAULT_SETTINGS = {'TWITTER_CONSUMER_KEY': '', 'TWITTER_ACCESS_TOKEN_KEY': '', 'TWITTER_ACCESS_TOKEN_SECRET': '', 'EMBEDLY_KEY': '', - 'EMAIL_GATEWAY_BOT_ZULIP_USER': None, + 'EMAIL_GATEWAY_BOT': None, 'EMAIL_GATEWAY_LOGIN': None, 'EMAIL_GATEWAY_PASSWORD': None, 'EMAIL_GATEWAY_IMAP_SERVER': None,