Stop using an array as a cache key

[sommitrealweird.git] / sommitrealweird / settings.py

diff --git a/sommitrealweird/settings.py b/sommitrealweird/settings.py
index f0a5725bf29ebe99bb5ce0aba1c1d860475922c0..95ead0af9503abad2d07062952eb71ac66b1076c 100644 (file)
--- a/sommitrealweird/settings.py
+++ b/sommitrealweird/settings.py
@@ -13,12 +13,12 @@ ADMINS = (
 
 MANAGERS = ADMINS
 
-DATABASE_ENGINE = 'sqlite3'
-DATABASE_NAME = os.path.join(topdir, 'sommitrealweird.db')
-DATABASE_USER = ''
-DATABASE_PASSWORD = ''
-DATABASE_HOST = ''
-DATABASE_PORT = ''
+DATABASES = {
+    'default': {
+            'ENGINE': 'django.db.backends.sqlite3',
+            'NAME': os.path.join(topdir, 'sommitrealweird.db')
+    }
+}
 
 TIME_ZONE = 'Europe/London'
 
@@ -33,24 +33,31 @@ USE_I18N = True
 MEDIA_ROOT = os.path.join(topdir, 'media') + os.sep
 MEDIA_URL = '/media/'
 
-ADMIN_MEDIA_PREFIX = '/admin-media/'
+STATIC_URL = '/static/'
 
 import random
 import string
 key_chars = "%s%s%s" % (string.letters, string.digits, '+-()_#~')
 SECRET_KEY = [random.choice(key_chars) for a in range(0,50)]
 
-CACHE_BACKEND = 'file://%s/tmp' %(topdir)
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
+         'LOCATION': '%s/tmp' %(topdir),
+    }
+}
 
 TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.load_template_source',
-    'django.template.loaders.app_directories.load_template_source',
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader',
 )
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
     'django.middleware.doc.XViewMiddleware',
 )
 
@@ -67,6 +74,7 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.markup',
+    'django.contrib.comments',
     'bpcms',
     'generic',
     'blog',
@@ -74,7 +82,7 @@ INSTALLED_APPS = (
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.core.context_processors.auth',
+    'django.contrib.auth.context_processors.auth',
     'django.core.context_processors.debug',
     'django.core.context_processors.i18n',
     'generic.context_processors.media',
@@ -90,6 +98,7 @@ APPEND_SLASH=False
 
 RESTRUCTUREDTEXT_FILTER_SETTINGS = {
     'initial_header_level': 2,
+    'doctitle_xform': False,
 }
 
 BPCMS_ROOT = '/'