archive/theorangeone.net-legacy
Archived
1
Fork 0
Code Releases Packages Activity

cleanup settings

Browse source
This commit is contained in:
Jake Howard 2016-11-23 17:22:23 +00:00
parent 7553730e5e
commit 435907732b
1 changed files with 8 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
project/settings.py
View file

@ -1,22 +1,6 @@
"""
Django settings for project project.
Generated by 'django-admin startproject' using Django 1.10.3.
For more information on this file, see
https://docs.djangoproject.com/en/1.10/topics/settings/
For the full list of settings and their values, see
https://docs.djangoproject.com/en/1.10/ref/settings/
"""
from __future__ import absolute_import, unicode_literals
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
import os import os
PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
BASE_DIR = PROJECT_DIR
ALLOWED_HOSTS = ['*'] ALLOWED_HOSTS = ['*']
@ -65,6 +49,10 @@ INSTALLED_APPS = [
] ]
MIDDLEWARE = [ MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'whitenoise.middleware.WhiteNoiseMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware', 'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware', 'django.middleware.csrf.CsrfViewMiddleware',
@ -72,9 +60,6 @@ MIDDLEWARE = [
'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django.middleware.security.SecurityMiddleware',
'whitenoise.middleware.WhiteNoiseMiddleware',
'wagtail.wagtailcore.middleware.SiteMiddleware', 'wagtail.wagtailcore.middleware.SiteMiddleware',
'wagtail.wagtailredirects.middleware.RedirectMiddleware', 'wagtail.wagtailredirects.middleware.RedirectMiddleware',
@ -86,7 +71,7 @@ TEMPLATES = [
{ {
'BACKEND': 'django.template.backends.django.DjangoTemplates', 'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [ 'DIRS': [
os.path.join(PROJECT_DIR, 'templates'), os.path.join(BASE_DIR, 'templates'),
], ],
'APP_DIRS': True, 'APP_DIRS': True,
'OPTIONS': { 'OPTIONS': {
@ -118,7 +103,7 @@ DATABASES = {
# Internationalization # Internationalization
# https://docs.djangoproject.com/en/1.10/topics/i18n/ # https://docs.djangoproject.com/en/1.10/topics/i18n/
LANGUAGE_CODE = 'en-us' LANGUAGE_CODE = 'en-GB'
TIME_ZONE = 'UTC' TIME_ZONE = 'UTC'
@ -130,7 +115,7 @@ USE_TZ = True
STATICFILES_DIRS = [ STATICFILES_DIRS = [
os.path.join(PROJECT_DIR, 'static'), os.path.join(BASE_DIR, 'static'),
] ]
STATIC_ROOT = os.path.join(BASE_DIR, 'collected-static') STATIC_ROOT = os.path.join(BASE_DIR, 'collected-static')