X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/bb551d54ea65621cae28c6acbfd91b22dc441dae..5bbc488088e1d46bd14ebf9a96852f8ee8b231a2:/redakcja/settings/common.py?ds=sidebyside diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py index 7c40abe5..5a337fb0 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'), ) @@ -101,13 +99,6 @@ 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', @@ -117,20 +108,25 @@ INSTALLED_APPS = ( 'django.contrib.admindocs', 'django.contrib.comments', - 'django_cas', 'compress', 'south', 'sorl.thumbnail', 'filebrowser', 'pagination', 'gravatar', + 'djcelery', + 'djkombu', + 'catalogue', 'dvcs', 'wiki', 'toolbar', 'apiclient', ) +LOGIN_REDIRECT_URL = '/documents/user' + + FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/' FILEBROWSER_DIRECTORY = 'images/' FILEBROWSER_ADMIN_VERSIONS = [] @@ -141,12 +137,15 @@ FILEBROWSER_DEFAULT_ORDER = "path_relative" IMAGE_DIR = 'images' -WL_API_CONFIG = { - "URL": "http://localhost:7000/api/", - "AUTH_REALM": "WL API", - "AUTH_USER": "platforma", - "AUTH_PASSWD": "platforma", -} +import djcelery +djcelery.setup_loader() + +BROKER_BACKEND = "djkombu.transport.DatabaseTransport" +BROKER_HOST = "localhost" +BROKER_PORT = 5672 +BROKER_USER = "guest" +BROKER_PASSWORD = "guest" +BROKER_VHOST = "/" SHOW_APP_VERSION = False