Changes from server.

[cas.git] / src / cas / settings.py

diff --git a/src/cas/settings.py b/src/cas/settings.py
index 562111c..1883595 100644 (file)
--- a/src/cas/settings.py
+++ b/src/cas/settings.py
@@ -4,7 +4,6 @@ from os import path
 PROJECT_ROOT = path.realpath(path.dirname(__file__))
 
 DEBUG = True
 PROJECT_ROOT = path.realpath(path.dirname(__file__))
 
 DEBUG = True

-TEMPLATE_DEBUG = DEBUG

 
 ADMINS = [
 ]
 
 ADMINS = [
 ]


@@ -27,7 +26,7 @@ DATABASES = {
 # although not all choices may be available on all operating systems.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
 # although not all choices may be available on all operating systems.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.

-TIME_ZONE = None
+TIME_ZONE = 'UTC'

 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html


@@ -57,9 +56,28 @@ STATICFILES_DIRS = [
 
 ROOT_URLCONF = 'cas.urls'
 
 
 ROOT_URLCONF = 'cas.urls'
 

-TEMPLATE_DIRS = (
-    PROJECT_ROOT + '/templates',
-)
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'APP_DIRS': True,
+        'DIRS': [
+            PROJECT_ROOT + '/templates',
+        ],
+        'OPTIONS': {
+            'context_processors': [
+                "django.contrib.auth.context_processors.auth",
+                "django.template.context_processors.debug",
+                "django.template.context_processors.i18n",
+                "django.template.context_processors.media",
+                "django.template.context_processors.static",
+                "django.template.context_processors.tz",
+                "django.contrib.messages.context_processors.messages",
+                "django.template.context_processors.request",
+            ],
+            'debug': DEBUG,
+        },
+    },
+]

 
 LOCALE_PATHS = (
     PROJECT_ROOT + '/locale',
 
 LOCALE_PATHS = (
     PROJECT_ROOT + '/locale',


@@ -80,7 +98,7 @@ INSTALLED_APPS = (
     'accounts',
 )
 
     'accounts',
 )
 

-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (

     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',


@@ -89,17 +107,6 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
 
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
 

-TEMPLATE_CONTEXT_PROCESSORS = (
-    "django.contrib.auth.context_processors.auth",
-    "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-cas-provider settings
 LOGIN_URL = '/cas/login/'
 LOGOUT_URL = '/cas/logout/'
 # django-cas-provider settings
 LOGIN_URL = '/cas/login/'
 LOGOUT_URL = '/cas/logout/'