Merge branch 'main' into opengraph-image-generation

2021-06-17 15:17:54 -07:00
parent 5966520f0d 321554f17e
commit 973b23856c
86 changed files with 2188 additions and 1834 deletions
--- a/celerywyrm/settings.py
+++ b/celerywyrm/settings.py
@ -1,10 +1,10 @@
 """ bookwyrm settings and configuration """
 from bookwyrm.settings import *

-CELERY_BROKER_URL = env("CELERY_BROKER")
+CELERY_BROKER_URL = CELERY_BROKER
 CELERY_ACCEPT_CONTENT = ["json"]
 CELERY_TASK_SERIALIZER = "json"
-CELERY_RESULT_BACKEND = "redis"
+FLOWER_PORT = env("FLOWER_PORT")

 INSTALLED_APPS = INSTALLED_APPS + [
    "celerywyrm",