fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attempt to add traceback logging
[redakcja.git]
/
platforma
/
settings.py
diff --git
a/platforma/settings.py
b/platforma/settings.py
old mode 100755
(executable)
new mode 100644
(file)
index
6a1a12e
..
634d6cb
--- a/
platforma/settings.py
+++ b/
platforma/settings.py
@@
-3,11
+3,13
@@
from os import path
PROJECT_ROOT = path.realpath(path.dirname(__file__))
PROJECT_ROOT = path.realpath(path.dirname(__file__))
-DEBUG =
Tru
e
+DEBUG =
Fals
e
TEMPLATE_DEBUG = DEBUG
TEMPLATE_DEBUG = DEBUG
+MAINTENANCE_MODE = False
+
ADMINS = (
ADMINS = (
- (u'Marek Stępniowski', 'marek@stepniowski.com'),
+
#
(u'Marek Stępniowski', 'marek@stepniowski.com'),
(u'Łukasz Rekucki', 'lrekucki@gmail.com'),
)
(u'Łukasz Rekucki', 'lrekucki@gmail.com'),
)
@@
-78,17
+80,34
@@
TEMPLATE_CONTEXT_PROCESSORS = (
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
+
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
+ 'django_cas.middleware.CASMiddleware',
+
'django.middleware.doc.XViewMiddleware',
'maintenancemode.middleware.MaintenanceModeMiddleware',
)
'django.middleware.doc.XViewMiddleware',
'maintenancemode.middleware.MaintenanceModeMiddleware',
)
+AUTHENTICATION_BACKENDS = (
+ 'django.contrib.auth.backends.ModelBackend',
+ 'django_cas.backends.CASBackend',
+)
+
ROOT_URLCONF = 'urls'
TEMPLATE_DIRS = (
PROJECT_ROOT + '/templates',
)
ROOT_URLCONF = 'urls'
TEMPLATE_DIRS = (
PROJECT_ROOT + '/templates',
)
+
+#
+# Central Auth System
+#
+## Set this to where the CAS server lives
+# CAS_SERVER_URL = "http://cas.fnp.pl/
+CAS_ADMIN_PREFIX = "/admin/"
+CAS_LOGOUT_COMPLETELY = True
+
# CSS and JS files to compress
# COMPRESS_CSS = {
# 'all': {
# CSS and JS files to compress
# COMPRESS_CSS = {
# 'all': {
@@
-107,6
+126,7
@@
TEMPLATE_DIRS = (
#
# COMPRESS_CSS_FILTERS = None
#
# COMPRESS_CSS_FILTERS = None
+
INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
@@
-123,13
+143,27
@@
INSTALLED_APPS = (
'toolbar',
)
'toolbar',
)
+
+#
+# Nose tests
+#
+
TEST_RUNNER = 'django_nose.run_tests'
TEST_RUNNER = 'django_nose.run_tests'
+TEST_MODULES = ('wiki', 'toolbar', 'vstorage')
+NOSE_ARGS = (
+ '--tests=' + ','.join(TEST_MODULES),
+ '--cover-package=' + ','.join(TEST_MODULES),
+ '-d',
+ '--with-coverage',
+ '--with-doctest'
+)
FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/'
FILEBROWSER_DIRECTORY = 'images/'
FILEBROWSER_ADMIN_VERSIONS = []
FILEBROWSER_VERSIONS_BASEDIR = 'thumbnails/'
FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/'
FILEBROWSER_DIRECTORY = 'images/'
FILEBROWSER_ADMIN_VERSIONS = []
FILEBROWSER_VERSIONS_BASEDIR = 'thumbnails/'
+FILEBROWSER_DEFAULT_ORDER = "path_relative"
# REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'
IMAGE_DIR = 'images'
# REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'
IMAGE_DIR = 'images'
@@
-145,7
+179,6
@@
formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(messag
ch.setFormatter(formatter)
log.addHandler(ch)
ch.setFormatter(formatter)
log.addHandler(ch)
-
# 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 *