From: Radek Czajka Date: Fri, 30 Nov 2012 11:32:43 +0000 (+0100) Subject: simpler settings X-Git-Url: https://git.mdrn.pl/fnp-django-template.git/commitdiff_plain/cce51873845f49cb6dec0efa28e3beb8a23cf472?ds=sidebyside simpler settings --- diff --git a/project_name/settings.d/40-context.py b/project_name/settings.d/40-context.py index fe0dd19..e161e0b 100644 --- a/project_name/settings.d/40-context.py +++ b/project_name/settings.d/40-context.py @@ -1,10 +1,12 @@ -TEMPLATE_CONTEXT_PROCESSORS = ( - "django.contrib.auth.context_processors.auth", +TEMPLATE_CONTEXT_PROCESSORS = tuple(x for x in ( + "django.contrib.auth.context_processors.auth" + if "django.contrib.auth" in INSTALLED_APPS else None, "django.core.context_processors.debug", "django.core.context_processors.i18n", "django.core.context_processors.media", "django.core.context_processors.static", "django.core.context_processors.tz", - "django.contrib.messages.context_processors.messages", - 'django.core.context_processors.request', -) + "django.contrib.messages.context_processors.messages" + if 'django.contrib.messages' in INSTALLED_APPS else None, + "django.core.context_processors.request" +) if x is not None) diff --git a/project_name/settings.d/40-middleware.py b/project_name/settings.d/40-middleware.py index ca43d26..b211d42 100644 --- a/project_name/settings.d/40-middleware.py +++ b/project_name/settings.d/40-middleware.py @@ -1,31 +1,22 @@ -MIDDLEWARE_CLASSES = ( - 'django.contrib.sessions.middleware.SessionMiddleware', +MIDDLEWARE_CLASSES = tuple(x for x in ( + 'django.contrib.sessions.middleware.SessionMiddleware' + if "django.contrib.sessions" in INSTALLED_APPS else None, #'django.middleware.locale.LocaleMiddleware', 'fnpdjango.middleware.URLLocaleMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', -) - -if 'django_cas' in INSTALLED_APPS: - MIDDLEWARE_CLASSES += ( - 'django_cas.middleware.CASMiddleware', - ) - -MIDDLEWARE_CLASSES += ( - 'django.contrib.messages.middleware.MessageMiddleware', -) - -if 'piwik.django' in INSTALLED_APPS: - MIDDLEWARE_CLASSES += ( - 'piwik.django.middleware.PiwikMiddleware', - ) - -MIDDLEWARE_CLASSES += ( + 'django.contrib.auth.middleware.AuthenticationMiddleware' + if "django.contrib.auth" in INSTALLED_APPS else None, + 'django_cas.middleware.CASMiddleware' + if "django_cas" in INSTALLED_APPS else None, + 'django.contrib.messages.middleware.MessageMiddleware' + if "django.contrib.messages" in INSTALLED_APPS else None, + 'piwik.django.middleware.PiwikMiddleware' + if "piwik.django" in INSTALLED_APPS else None, # Uncomment the next line for simple clickjacking protection: # 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'pagination.middleware.PaginationMiddleware', - # Comment out if not behind proxy setting the Real-IP header (like Nginx). - 'fnpdjango.middleware.SetRemoteAddrFromXRealIP', -) + 'pagination.middleware.PaginationMiddleware' + if "pagination" in INSTALLED_APPS else None, + 'fnpdjango.middleware.SetRemoteAddrFromXRealIP' +) if x is not None) diff --git a/project_name/settings.d/60-custom.py b/project_name/settings.d/60-custom.py index 5d790c0..e69de29 100644 --- a/project_name/settings.d/60-custom.py +++ b/project_name/settings.d/60-custom.py @@ -1,3 +0,0 @@ -# Use Nginx's X-accel when serving files with helpers.serve_file(). -# See http://wiki.nginx.org/X-accel -X_ACCEL_REDIRECT = False