From 81886e6b2c690a7d571ffde5500dcc0c60586049 Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Tue, 2 Sep 2014 13:51:47 +0200 Subject: [PATCH] [django 1.7] add BASE_DIR setting to match the new template; remove ADMININS, MANAGERS and TEMPLATE_LOADERS --- pyweb/settings.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pyweb/settings.py b/pyweb/settings.py index 1bd705b..c57d1b6 100644 --- a/pyweb/settings.py +++ b/pyweb/settings.py @@ -63,11 +63,6 @@ MUMBLE_DJANGO_ROOT = None ## ################################################################# ################################################################# -# Who will receive emails on errors? -ADMINS = ( - # ('Your Name', 'your_email@domain.com'), -) - # Show debug information on errors? # If you want to file a bug report, please enable this option. DEBUG = True @@ -151,6 +146,8 @@ from os.path import join, dirname, abspath, exists if not MUMBLE_DJANGO_ROOT or not exists( MUMBLE_DJANGO_ROOT ): MUMBLE_DJANGO_ROOT = dirname(dirname(abspath(__file__))) +BASE_DIR = MUMBLE_DJANGO_ROOT + # Default mumble port. If your server runs under this port, it will not be # included in the links in the Channel Viewer. MUMBLE_DEFAULT_PORT = 64738 @@ -182,8 +179,6 @@ DATABASES = { TEMPLATE_DEBUG = DEBUG -MANAGERS = ADMINS - SITE_ID = 1 # If you set this to False, Django will make some optimizations so as not @@ -224,13 +219,6 @@ except NameError: Exception('Please create a %s file with random characters to generate your secret key!' % SECRET_FILE) -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', -# 'django.template.loaders.eggs.Loader', -) - MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',