Minor migration fix.

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

diff --git a/src/cas/settings.py b/src/cas/settings.py
index 21a4a35..a4c4137 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 = [
 ]


@@ -41,22 +40,47 @@ USE_I18N = True
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"

-MEDIA_ROOT = PROJECT_ROOT + '/media/'
+MEDIA_ROOT = path.join(PROJECT_ROOT, '../../media/')

 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
 MEDIA_URL = '/media/'
 
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
 MEDIA_URL = '/media/'
 

-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/admin-media/'
+STATIC_ROOT = path.join(PROJECT_ROOT, '../../static/')
+STATIC_URL = '/static/'
+
+STATICFILES_DIRS = [
+    path.join(PROJECT_ROOT, 'static'),
+]

 
 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',

 )
 
 INSTALLED_APPS = (
 )
 
 INSTALLED_APPS = (


@@ -66,14 +90,24 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',

+    'django.contrib.staticfiles',

 
     'cas_provider',
 
     'cas_provider',

-    'gravatar',
-    'south',
+    'django_gravatar',

 
     'accounts',
 )
 
 
     'accounts',
 )
 

+MIDDLEWARE_CLASSES = (
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+)
+

 # django-cas-provider settings
 LOGIN_URL = '/cas/login/'
 LOGOUT_URL = '/cas/logout/'
 # django-cas-provider settings
 LOGIN_URL = '/cas/login/'
 LOGOUT_URL = '/cas/logout/'


@@ -82,9 +116,10 @@ CAS_CUSTOM_ATTRIBUTES_CALLBACK = 'cas.utils.custom_attributes_callback'
 SESSION_COOKIE_NAME = 'fnpcas'
 
 GRAVATAR_DEFAULT_IMAGE = 'mm'
 SESSION_COOKIE_NAME = 'fnpcas'
 
 GRAVATAR_DEFAULT_IMAGE = 'mm'

+GRAVATAR_URL_PREFIX = 'https://www.gravatar.com/'

 
 # Import localsettings file, which may override settings defined here
 try:
 
 # Import localsettings file, which may override settings defined here
 try:

-    from localsettings import *
+    from .localsettings import *

 except ImportError:
     pass
 except ImportError:
     pass