paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Remove obsolete VOYAGER setting.

Browse Source
This commit is contained in:
Tim Abbott
2017-09-28 17:30:17 -07:00
parent b38cc4ecf7
commit 43f967bccd
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/build-release-tarball
View File

@@ -66,8 +66,8 @@ mkdir -p "var/log"
# Some settings need to be updated for update-prod-static to work # Some settings need to be updated for update-prod-static to work
# #
# TODO: Would be much better to instead run the below tools with some # TODO: Would be much better to instead run the below tools with some
# sort of environment hack to make settings.VOYAGER=True so that we # sort of environment hack so that we don't need to create this dummy
# don't need to create this dummy secrets file. # secrets file.
cat >> zproject/prod_settings_template.py <<EOF cat >> zproject/prod_settings_template.py <<EOF
DEBUG = False DEBUG = False
EOF EOF

9
zproject/settings.py
View File

@@ -142,7 +142,7 @@ DEFAULT_SETTINGS = {
'RATE_LIMITING': True, 'RATE_LIMITING': True,
'REDIS_HOST': '127.0.0.1', 'REDIS_HOST': '127.0.0.1',
'REDIS_PORT': 6379, 'REDIS_PORT': 6379,
# The following bots only exist in non-VOYAGER installs # The following bots are optional system bots.
'ERROR_BOT': None, 'ERROR_BOT': None,
'NEW_USER_BOT': None, 'NEW_USER_BOT': None,
'NAGIOS_STAGING_SEND_BOT': None, 'NAGIOS_STAGING_SEND_BOT': None,
@@ -239,13 +239,6 @@ if ADMINS == "":
ADMINS = (("Zulip Administrator", ZULIP_ADMINISTRATOR),) ADMINS = (("Zulip Administrator", ZULIP_ADMINISTRATOR),)
MANAGERS = ADMINS 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
######################################################################## ########################################################################
# STANDARD DJANGO SETTINGS # STANDARD DJANGO SETTINGS
######################################################################## ########################################################################