Factor out EXTRA_INSTALLED_APPS setting.

This commit is contained in:
Tim Abbott
2016-04-26 21:28:51 -07:00
parent 6e1e4aaef6
commit 2b30b670e0
2 changed files with 9 additions and 7 deletions

View File

@@ -123,3 +123,8 @@ ZULIP_ADMINISTRATOR = 'support@zulip.com'
ADMINS = (
('Zulip Error Reports', 'errors@zulip.com'),
)
EXTRA_INSTALLED_APPS = [
'analytics',
'zilencer',
]

View File

@@ -160,6 +160,7 @@ DEFAULT_SETTINGS = {'TWITTER_CONSUMER_KEY': '',
'REMOTE_POSTGRES_SSLMODE': '',
'GOOGLE_CLIENT_ID': '',
'DBX_APNS_CERT_FILE': None,
'EXTRA_INSTALLED_APPS': [],
}
for setting_name, setting_val in six.iteritems(DEFAULT_SETTINGS):
@@ -268,6 +269,8 @@ ROOT_URLCONF = 'zproject.urls'
# Python dotted path to the WSGI application used by Django's runserver.
WSGI_APPLICATION = 'zproject.wsgi.application'
# A site can include additional installed apps via the
# EXTRA_INSTALLED_APPS setting
INSTALLED_APPS = [
'django.contrib.auth',
'django.contrib.contenttypes',
@@ -278,13 +281,7 @@ INSTALLED_APPS = [
'guardian',
'pipeline',
'zerver',
]
if not VOYAGER:
INSTALLED_APPS += [
'analytics',
'zilencer',
]
] + EXTRA_INSTALLED_APPS
# Base URL of the Tornado server
# We set it to None when running backend tests or populate_db.