From bdbd8d006ae7691461f464d64e3bb614ae86775b Mon Sep 17 00:00:00 2001 From: Steve Howell Date: Wed, 6 Nov 2013 15:09:52 -0500 Subject: [PATCH] Exclude analytics and zilencer from LOCAL_SERVER INSTALLED_APPS. (imported from commit f055ff18166d73b3531d27ccef7f5d457cd89017) --- zproject/settings.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/zproject/settings.py b/zproject/settings.py index 6f53077a91..4b3d95444d 100644 --- a/zproject/settings.py +++ b/zproject/settings.py @@ -164,7 +164,7 @@ ROOT_URLCONF = 'zproject.urls' # Python dotted path to the WSGI application used by Django's runserver. WSGI_APPLICATION = 'zproject.wsgi.application' -INSTALLED_APPS = ( +INSTALLED_APPS = [ 'django.contrib.auth', 'zproject.authhack', 'django.contrib.contenttypes', @@ -173,13 +173,17 @@ INSTALLED_APPS = ( 'django.contrib.staticfiles', 'south', 'django_openid_auth', - 'analytics', 'confirmation', 'guardian', 'pipeline', 'zerver', - 'zilencer', -) +] + +if not LOCAL_SERVER: + INSTALLED_APPS += [ + 'analytics', + 'zilencer', + ] LOCAL_STATSD = (False) USING_STATSD = (DEPLOYED and not TESTING_DEPLOYED and not LOCAL_SERVER) or LOCAL_STATSD @@ -199,7 +203,7 @@ if USING_STATSD: else: STATSD_HOST = 'stats.zulip.net' - INSTALLED_APPS = ('django_statsd',) + INSTALLED_APPS + INSTALLED_APPS += ['django_statsd'] STATSD_PORT = 8125 STATSD_CLIENT = 'django_statsd.clients.normal'