fnp
/
cas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated link on profile page
[cas.git]
/
src
/
cas
/
settings.py
diff --git
a/src/cas/settings.py
b/src/cas/settings.py
index
a039d14
..
3262fcd
100644
(file)
--- a/
src/cas/settings.py
+++ b/
src/cas/settings.py
@@
-6,7
+6,9
@@
PROJECT_ROOT = path.realpath(path.dirname(__file__))
DEBUG = True
TEMPLATE_DEBUG = DEBUG
DEBUG = True
TEMPLATE_DEBUG = DEBUG
-ADMINS = []
+ADMINS = [
+ "lrekucki@gmail.com",
+]
MANAGERS = ADMINS
MANAGERS = ADMINS
@@
-37,13
+39,11
@@
USE_I18N = True
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
MEDIA_ROOT = PROJECT_ROOT + '/media/'
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
MEDIA_ROOT = PROJECT_ROOT + '/media/'
-STATIC_ROOT = PROJECT_ROOT + '/static/'
# 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/'
-STATIC_URL = '/static/'
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
# trailing slash.
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
# trailing slash.
@@
-61,6
+61,7
@@
TEMPLATE_CONTEXT_PROCESSORS = (
"django.core.context_processors.auth",
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
"django.core.context_processors.auth",
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
+ 'django.core.context_processors.media',
"django.core.context_processors.request",
)
"django.core.context_processors.request",
)
@@
-72,10
+73,10
@@
MIDDLEWARE_CLASSES = (
'django.middleware.doc.XViewMiddleware',
)
'django.middleware.doc.XViewMiddleware',
)
-ROOT_URLCONF = 'urls'
+ROOT_URLCONF = '
cas.
urls'
TEMPLATE_DIRS = (
TEMPLATE_DIRS = (
- PROJECT_ROOT + '/templates',
+ PROJECT_ROOT + '/templates',
)
INSTALLED_APPS = (
)
INSTALLED_APPS = (
@@
-85,21
+86,17
@@
INSTALLED_APPS = (
'django.contrib.sites',
'django.contrib.admin',
'django.contrib.admindocs',
'django.contrib.sites',
'django.contrib.admin',
'django.contrib.admindocs',
-
+
'cas_provider',
'cas_provider',
+ 'accounts',
)
# django-cas-provider settings
LOGIN_URL = '/cas/login/'
LOGOUT_URL = '/cas/logout/'
)
# django-cas-provider settings
LOGIN_URL = '/cas/login/'
LOGOUT_URL = '/cas/logout/'
-CAS_CUSTOM_ATTRIBUTES_CALLBACK = 'utils.custom_attributes_callback'
+CAS_CUSTOM_ATTRIBUTES_CALLBACK = '
cas.
utils.custom_attributes_callback'
SESSION_COOKIE_NAME = 'fnpcas'
SESSION_COOKIE_NAME = 'fnpcas'
-# Python logging settings
-import logging
-import logging.config
-logging.config.fileConfig(path.join(PROJECT_ROOT, "logging.cfg"))
-
# Import localsettings file, which may override settings defined here
try:
from localsettings import *
# Import localsettings file, which may override settings defined here
try:
from localsettings import *