user redis instead of rabbitmq

diff --git a/app/deploy/celery_app.sh b/app/deploy/celery_app.sh
index f0a81608a5089ee4fa78a033cbf5a979a00e09ca..a89971d4553e180b52f3cdde1cfacc184d4e9c77 100644 (file)
--- a/app/deploy/celery_app.sh
+++ b/app/deploy/celery_app.sh
@@ -6,7 +6,7 @@ manage=$app'/manage.py'
 wsgi=$app'/wsgi.py'
 
 # stating apps
-# pip install django-haystack elasticsearch
+pip install redis
 
 # waiting for other services
 sh $app/deploy/wait.sh

diff --git a/app/deploy/start_app.sh b/app/deploy/start_app.sh
index be957d1749877d54aceffc71b5ba6585549b89aa..a45f84381baed4f4849b07b1bac6f7ea10db904c 100644 (file)
--- a/app/deploy/start_app.sh
+++ b/app/deploy/start_app.sh
@@ -13,7 +13,7 @@ threads=2
 autoreload=3
 
 # stating apps
-# pip install django-haystack elasticsearch
+pip install redis
 
 # waiting for other services
 sh $app/deploy/wait.sh

diff --git a/app/sandbox/settings.py b/app/sandbox/settings.py
index 271f14b29c98f53b775ea11d046a3f753f5a6d6a..880a18820434fb8c008033598c8b9d5666de98b0 100644 (file)
--- a/app/sandbox/settings.py
+++ b/app/sandbox/settings.py
@@ -281,11 +281,13 @@ LOGGING = {
 }
 
 # replace rabbitmq by localhost if you start your app outside docker-compose
-BROKER_URL = 'amqp://guest:guest@broker//'
+# 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_BACKEND = 'djcelery.backends.database:DatabaseBackend'
+CELERY_TASK_SERIALIZER = 'json'
+CELERY_RESULT_SERIALIZER = 'json'
 CELERY_ACCEPT_CONTENT = ['application/json']
 
 from celery_app import app

diff --git a/docker-compose.yml b/docker-compose.yml
index f1de446c8075f055940c68db6c9bd06a3831c64e..d79cb7758612aaf9995ecd1195b6e60d91806585 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,7 +33,7 @@ media:
 db:
   image: mysql
   volumes_from:
-    - media 
+    - media
   environment:
     - MYSQL_ROOT_PASSWORD=ItCydyatzix8
     - MYSQL_DATABASE=telemeta
@@ -41,7 +41,7 @@ db:
     - MYSQL_PASSWORD=iuvIlkyisFit2
 
 broker:
-  image: rabbitmq:3-management
+  image: redis
 
 search:
   image: elasticsearch:1
@@ -75,7 +75,7 @@ worker:
 nginx:
   image: nginx
   ports:
-    - "8001:80"
+    - "8000:80"
   volumes:
     - ./app/deploy/nginx-app.conf:/etc/nginx/conf.d/default.conf
     - ./log/:/var/log/nginx

diff --git a/telemeta/locale b/telemeta/locale
index 4534a3d47e7909554637e87a637b1959db277941..91973b13f9dc9405052727c0c525d342dee15562 160000 (submodule)
--- a/telemeta/locale
+++ b/telemeta/locale
@@ -1 +1 @@
-Subproject commit 4534a3d47e7909554637e87a637b1959db277941
+Subproject commit 91973b13f9dc9405052727c0c525d342dee15562

diff --git a/telemeta/pages b/telemeta/pages
index 771dfcc58e26f43a507c3bc48fcb5ddde55ca0b1..f8324093174d077b674ac2c52eb0db6eaf815ab5 160000 (submodule)
--- a/telemeta/pages
+++ b/telemeta/pages
@@ -1 +1 @@
-Subproject commit 771dfcc58e26f43a507c3bc48fcb5ddde55ca0b1
+Subproject commit f8324093174d077b674ac2c52eb0db6eaf815ab5