From bb111c03292f88d848fe3daebe57c4cba6ceaa91 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Wed, 29 Apr 2020 16:04:30 -0400
Subject: [PATCH] Add rabbitmq

---
 {{cookiecutter.project_slug}}/.envs/.local/.django |  3 +++
 .../.envs/.production/.django                      |  3 +++
 .../compose/production/django/entrypoint           |  2 +-
 .../config/settings/base.py                        |  2 +-
 {{cookiecutter.project_slug}}/local.yml            | 14 +++++++++-----
 {{cookiecutter.project_slug}}/production.yml       |  5 +++++
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.envs/.local/.django b/{{cookiecutter.project_slug}}/.envs/.local/.django
index 919f31185..03d3e5ed5 100644
--- a/{{cookiecutter.project_slug}}/.envs/.local/.django
+++ b/{{cookiecutter.project_slug}}/.envs/.local/.django
@@ -11,6 +11,9 @@ REDIS_URL=redis://redis:6379/0
 # Celery
 # ------------------------------------------------------------------------------
 
+# RabbitMQ
+RABBITMQ_URL=amqp://user:bitnami@rabbitmq:5672/
+
 # Flower
 CELERY_FLOWER_USER=!!!SET CELERY_FLOWER_USER!!!
 CELERY_FLOWER_PASSWORD=!!!SET CELERY_FLOWER_PASSWORD!!!
diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.django b/{{cookiecutter.project_slug}}/.envs/.production/.django
index e7e8461c9..51241c1a0 100644
--- a/{{cookiecutter.project_slug}}/.envs/.production/.django
+++ b/{{cookiecutter.project_slug}}/.envs/.production/.django
@@ -65,6 +65,9 @@ REDIS_URL=redis://redis:6379/0
 # Celery
 # ------------------------------------------------------------------------------
 
+# RabbitMQ
+RABBITMQ_URL=amqp://user:bitnami@rabbitmq:5672/
+
 # Flower
 CELERY_FLOWER_USER=!!!SET CELERY_FLOWER_USER!!!
 CELERY_FLOWER_PASSWORD=!!!SET CELERY_FLOWER_PASSWORD!!!
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
index 95ab8297a..bdab514a9 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
+++ b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
@@ -7,7 +7,7 @@ set -o nounset
 
 {% if cookiecutter.use_celery == 'y' %}
 # N.B. If only .env files supported variable expansion...
-export CELERY_BROKER_URL="${REDIS_URL}"
+export CELERY_BROKER_URL="${RABBITMQ_URL}"
 {% endif %}
 
 if [ -z "${POSTGRES_USER}" ]; then
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 390f2252c..87f2b8ef0 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -273,7 +273,7 @@ if USE_TZ:
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-broker_url
 CELERY_BROKER_URL = env("CELERY_BROKER_URL")
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-result_backend
-CELERY_RESULT_BACKEND = CELERY_BROKER_URL
+CELERY_RESULT_BACKEND = "rpc"
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-accept_content
 CELERY_ACCEPT_CONTENT = ["json"]
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-task_serializer
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index b603f1778..5620daadf 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -47,16 +47,18 @@ services:
   {%- endif %}
   {%- if cookiecutter.use_celery == 'y' %}
 
-  redis:
-    image: redis:5.0
-    container_name: redis
+  rabbitmq:
+    image: 'bitnami/rabbitmq:latest'
+    container_name: rabbitmq
+    ports:
+      - '5672:5672'
 
   celeryworker:
     <<: *django
     image: {{ cookiecutter.project_slug }}_local_celeryworker
     container_name: celeryworker
     depends_on:
-      - redis
+      - rabbitmq
       - postgres
       {% if cookiecutter.use_mailhog == 'y' -%}
       - mailhog
@@ -69,7 +71,7 @@ services:
     image: {{ cookiecutter.project_slug }}_local_celerybeat
     container_name: celerybeat
     depends_on:
-      - redis
+      - rabbitmq
       - postgres
       {% if cookiecutter.use_mailhog == 'y' -%}
       - mailhog
@@ -81,6 +83,8 @@ services:
     <<: *django
     image: {{ cookiecutter.project_slug }}_local_flower
     container_name: flower
+    depends_on:
+      - rabbitmq
     ports:
       - "5555:5555"
     command: /start-flower
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 2cd2af132..7a2090c2e 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -50,6 +50,11 @@ services:
     image: redis:5.0
   {%- if cookiecutter.use_celery == 'y' %}
 
+  rabbitmq:
+    image: 'bitnami/rabbitmq:latest'
+    ports:
+      - '5672:5672'
+
   celeryworker:
     <<: *django
     image: {{ cookiecutter.project_slug }}_production_celeryworker