Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dev_settings.py: Set EXTERNAL_HOST when REALMS_HAVE_SUBDOMAINS. 

Sets EXTERNAL_HOST to zulipdev.com:9991 when REALMS_HAVE_SUBDOMAINS, since
subdomains don't currently work with localhost anyway.
This commit is contained in:
Rishi Gupta 2016-10-27 14:14:23 -07:00 committed by Tim Abbott
parent df7e430849
commit dee597cfc5
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
zproject/dev_settings.py
View File

@ -5,9 +5,16 @@ from .prod_settings_template import *
import os import os
LOCAL_UPLOADS_DIR = 'var/uploads' LOCAL_UPLOADS_DIR = 'var/uploads'
# We check the environment to support test_settings.py controlling # Default to subdomains disabled in development until we can update
# EXTERNAL_HOST. # the development documentation to make sense with subdomains.
EXTERNAL_HOST = os.getenv('EXTERNAL_HOST', 'localhost:9991') REALMS_HAVE_SUBDOMAINS = False
# Check if test_settings.py set EXTERNAL_HOST.
EXTERNAL_HOST = os.getenv('EXTERNAL_HOST')
if EXTERNAL_HOST is None:
if REALMS_HAVE_SUBDOMAINS:
EXTERNAL_HOST = 'zulipdev.com:9991'
else:
EXTERNAL_HOST = 'localhost:9991'
ALLOWED_HOSTS = ['*'] ALLOWED_HOSTS = ['*']
AUTHENTICATION_BACKENDS = ('zproject.backends.DevAuthBackend',) AUTHENTICATION_BACKENDS = ('zproject.backends.DevAuthBackend',)
# Add some of the below if you're testing other backends # Add some of the below if you're testing other backends
@ -23,10 +30,6 @@ EXTRA_INSTALLED_APPS = ["zilencer", "analytics"]
# Disable Camo in development # Disable Camo in development
CAMO_URI = '' CAMO_URI = ''
OPEN_REALM_CREATION = True OPEN_REALM_CREATION = True
# Default to subdomains disabled in development until we can update
# the development documentation to make sense with subdomains.
# Change EXTERNAL_HOST to "zulipdev.com:9991" if you set REALMS_HAVE_SUBDOMAINS to True
REALMS_HAVE_SUBDOMAINS = False
TERMS_OF_SERVICE = 'zproject/terms.md.template' TERMS_OF_SERVICE = 'zproject/terms.md.template'
SAVE_FRONTEND_STACKTRACES = True SAVE_FRONTEND_STACKTRACES = True