From a7614f796ab110033639d93f89f0e6bea28ec073 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 14 Dec 2015 18:02:26 +0100 Subject: [PATCH] cleanup --- app/sandbox/settings.py | 7 +------ telemeta/locale | 2 +- telemeta/pages | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/sandbox/settings.py b/app/sandbox/settings.py index aa8ba062..7a1937b2 100644 --- a/app/sandbox/settings.py +++ b/app/sandbox/settings.py @@ -178,7 +178,6 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'django.contrib.messages.context_processors.messages', ) - AUTHENTICATION_BACKENDS = ( 'django.contrib.auth.backends.ModelBackend', 'ipauth.backend.RangeBackend', @@ -280,18 +279,16 @@ LOGGING = { } } +from celery_app import app # replace rabbitmq by localhost if you start your app outside docker-compose # BROKER_URL = 'amqp://guest:guest@broker//' BROKER_URL = 'redis://broker:6379/0' - CELERY_IMPORTS = ("timeside.server.tasks",) CELERY_RESULT_BACKEND = 'djcelery.backends.database:DatabaseBackend' CELERY_TASK_SERIALIZER = 'json' CELERY_RESULT_SERIALIZER = 'json' CELERY_ACCEPT_CONTENT = ['application/json'] -from celery_app import app - HAYSTACK_CONNECTIONS = { 'default': { @@ -300,7 +297,5 @@ HAYSTACK_CONNECTIONS = { 'INDEX_NAME': 'haystack', }, } - HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor' - HAYSTACK_SEARCH_RESULTS_PER_PAGE = 50 diff --git a/telemeta/locale b/telemeta/locale index 4534a3d4..91973b13 160000 --- a/telemeta/locale +++ b/telemeta/locale @@ -1 +1 @@ -Subproject commit 4534a3d47e7909554637e87a637b1959db277941 +Subproject commit 91973b13f9dc9405052727c0c525d342dee15562 diff --git a/telemeta/pages b/telemeta/pages index 771dfcc5..f8324093 160000 --- a/telemeta/pages +++ b/telemeta/pages @@ -1 +1 @@ -Subproject commit 771dfcc58e26f43a507c3bc48fcb5ddde55ca0b1 +Subproject commit f8324093174d077b674ac2c52eb0db6eaf815ab5 -- 2.39.5