Commit bb672be5 authored by Thom Wiggers's avatar Thom Wiggers 📐
Browse files

Merge branch 'celery_redis_db' into 'master'

Get CELERY_BROKER_URL from env vars as a whole

See merge request thalia/concrexit!852
parents bc470873 11156995
......@@ -28,7 +28,7 @@ services:
<<: *postgresvars
DJANGO_DEBUG: 'True'
DJANGO_POSTGRES_HOST: postgres
CELERY_REDIS_HOST: redis
CELERY_BROKER_URL: "redis://redis:6379/0"
celery:
image: registry.gitlab.com/thaliawww/concrexit
build: .
......
......@@ -127,9 +127,7 @@ if os.environ.get('DJANGO_EMAIL_HOST'):
EMAIL_TIMEOUT = 10
# Celery settings
CELERY_BROKER_URL = 'redis://{}:6379/0'.format(
os.environ.get('CELERY_REDIS_HOST')
)
CELERY_BROKER_URL = os.environ.get('CELERY_BROKER_URL')
CELERY_ENABLED = True
# Secure headers
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment