From dee597cfc56a219eb76f81790d59aeea2083670a Mon Sep 17 00:00:00 2001 From: Rishi Gupta Date: Thu, 27 Oct 2016 14:14:23 -0700 Subject: [PATCH] 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. --- zproject/dev_settings.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/zproject/dev_settings.py b/zproject/dev_settings.py index 11f76a776c..5a28077d5f 100644 --- a/zproject/dev_settings.py +++ b/zproject/dev_settings.py @@ -5,9 +5,16 @@ from .prod_settings_template import * import os LOCAL_UPLOADS_DIR = 'var/uploads' -# We check the environment to support test_settings.py controlling -# EXTERNAL_HOST. -EXTERNAL_HOST = os.getenv('EXTERNAL_HOST', 'localhost:9991') +# Default to subdomains disabled in development until we can update +# the development documentation to make sense with subdomains. +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 = ['*'] AUTHENTICATION_BACKENDS = ('zproject.backends.DevAuthBackend',) # Add some of the below if you're testing other backends @@ -23,10 +30,6 @@ EXTRA_INSTALLED_APPS = ["zilencer", "analytics"] # Disable Camo in development CAMO_URI = '' 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' SAVE_FRONTEND_STACKTRACES = True