From 73264ab53047fe271eb016e7cf295b542ba83375 Mon Sep 17 00:00:00 2001 From: Reid Barton Date: Fri, 28 Aug 2015 10:39:57 -0700 Subject: [PATCH] Move VOYAGER detection to after initialization of ZULIP_COM (imported from commit c9aa814ebc30a78abe8babfc3bf2eedb8198d17d) --- zproject/settings.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/zproject/settings.py b/zproject/settings.py index 068a4501d7..77feedcb02 100644 --- a/zproject/settings.py +++ b/zproject/settings.py @@ -96,13 +96,6 @@ else: NEW_USER_BOT = "new-user-bot@zulip.com" EMAIL_GATEWAY_BOT = "emailgateway@zulip.com" -# Voyager is a production zulip server that is not zulip.com or -# staging.zulip.com VOYAGER is the standalone all-on-one-server -# production deployment model for based on the original Zulip -# ENTERPRISE implementation. We expect most users of the open source -# project will be using VOYAGER=True in production. -VOYAGER = PRODUCTION and not ZULIP_COM - ######################################################################## # DEFAULT VALUES FOR SETTINGS ######################################################################## @@ -195,6 +188,13 @@ if ADMINS == "": ADMINS = (("Zulip Administrator", ZULIP_ADMINISTRATOR),) MANAGERS = ADMINS +# Voyager is a production zulip server that is not zulip.com or +# staging.zulip.com VOYAGER is the standalone all-on-one-server +# production deployment model for based on the original Zulip +# ENTERPRISE implementation. We expect most users of the open source +# project will be using VOYAGER=True in production. +VOYAGER = PRODUCTION and not ZULIP_COM + ######################################################################## # STANDARD DJANGO SETTINGS ########################################################################