paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-10 08:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Factor out EXTRA_INSTALLED_APPS setting.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
zproject/local_settings.py
View File

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

11
zproject/settings.py
View File

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