X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/bb551d54ea65621cae28c6acbfd91b22dc441dae..8132fc186eb0c5fd02c86828c3a4735754296d02:/redakcja/settings/common.py diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py index 7c40abe5..6c53d446 100644 --- a/redakcja/settings/common.py +++ b/redakcja/settings/common.py @@ -10,8 +10,6 @@ TEMPLATE_DEBUG = DEBUG MAINTENANCE_MODE = False ADMINS = ( - # (u'Marek Stępniowski', 'marek@stepniowski.com'), - # (u'Łukasz Rekucki', 'lrekucki@gmail.com'), (u'Radek Czajka', 'radoslaw.czajka@nowoczesnapolska.org.pl'), ) @@ -42,7 +40,11 @@ USE_L10N = True # Absolute path to the directory that holds media. # Example: "/home/media/media.lawrence.com/" MEDIA_ROOT = PROJECT_ROOT + '/media/dynamic' -STATIC_ROOT = PROJECT_ROOT + '/static/' +STATIC_ROOT = PROJECT_ROOT + '/../static/' + +STATICFILES_DIRS = [ + 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). @@ -50,13 +52,6 @@ STATIC_ROOT = PROJECT_ROOT + '/static/' MEDIA_URL = '/media/dynamic/' STATIC_URL = '/media/static/' -# 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 = '/media/admin-media/' - -# Make this unique, and don't share it with anybody. -SECRET_KEY = 'ife@x^_lak+x84=lxtr!-ur$5g$+s6xt85gbbm@e_fk6q3r8=+' SESSION_COOKIE_NAME = "redakcja_sessionid" # List of callables that know how to import templates from various sources. @@ -79,18 +74,19 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django_cas.middleware.CASMiddleware', - 'django.middleware.doc.XViewMiddleware', + 'django.contrib.admindocs.middleware.XViewMiddleware', 'pagination.middleware.PaginationMiddleware', 'maintenancemode.middleware.MaintenanceModeMiddleware', ) AUTHENTICATION_BACKENDS = ( 'django.contrib.auth.backends.ModelBackend', - 'django_cas.backends.CASBackend', + 'fnpdjango.auth_backends.AttrCASBackend', ) ROOT_URLCONF = 'redakcja.urls' @@ -101,55 +97,56 @@ TEMPLATE_DIRS = ( FIREPYTHON_LOGGER_NAME = "fnp" -# -# Central Auth System -# -## Set this to where the CAS server lives -# CAS_SERVER_URL = "http://cas.fnp.pl/ -CAS_LOGOUT_COMPLETELY = True - INSTALLED_APPS = ( 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', 'django.contrib.sites', 'django.contrib.admin', 'django.contrib.admindocs', 'django.contrib.comments', + 'raven.contrib.django.raven_compat', - 'django_cas', - 'compress', 'south', 'sorl.thumbnail', - 'filebrowser', 'pagination', - 'gravatar', - + 'django_gravatar', + 'fileupload', + 'kombu.transport.django', + 'pipeline', + 'fnpdjango', + + 'catalogue', + 'cover', 'dvcs', 'wiki', + 'wiki_img', 'toolbar', 'apiclient', + 'email_mangler', ) -FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/' -FILEBROWSER_DIRECTORY = 'images/' -FILEBROWSER_ADMIN_VERSIONS = [] -FILEBROWSER_VERSIONS_BASEDIR = 'thumbnails/' -FILEBROWSER_DEFAULT_ORDER = "path_relative" +LOGIN_REDIRECT_URL = '/documents/user' + +CAS_USER_ATTRS_MAP = { + 'email': 'email', 'firstname': 'first_name', 'lastname': 'last_name'} # REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books' -IMAGE_DIR = 'images' + +IMAGE_DIR = 'images/' -WL_API_CONFIG = { - "URL": "http://localhost:7000/api/", - "AUTH_REALM": "WL API", - "AUTH_USER": "platforma", - "AUTH_PASSWD": "platforma", -} +BROKER_URL = 'django://' +CELERY_EAGER_PROPAGATES_EXCEPTIONS = True +CELERY_SEND_TASK_ERROR_EMAILS = True +CELERY_ACCEPT_CONTENT = ['pickle'] # Remove when all tasks jsonable. SHOW_APP_VERSION = False +MIN_COVER_SIZE = (915, 1270) + try: from redakcja.settings.compress import * except ImportError: