Merge branch 'develop' into self-hosting-tweaks

This commit is contained in:
Kyle Lacy 2023-04-17 12:30:24 -07:00
commit e22f552ea0
No known key found for this signature in database
GPG key ID: 82616D2392FB6605
37 changed files with 299 additions and 170 deletions

View file

@ -241,10 +241,11 @@ LOGGER_BASE_URL = os.environ.get("LOGGER_BASE_URL", False)
broker_ssl = os.environ.get("REDIS_BROKER_SSL", "1") == "1"
redis_url = os.environ.get("REDIS_URL")
if broker_ssl:
broker_url = f"{redis_url}?ssl_cert_reqs={ssl.CERT_NONE.name}&ssl_ca_certs={certifi.where()}"
else:
broker_url = redis_url
broker_url = f"{redis_url}?ssl_cert_reqs={ssl.CERT_NONE.name}&ssl_ca_certs={certifi.where()}"
CELERY_RESULT_BACKEND = broker_url
CELERY_BROKER_URL = broker_url
if DOCKERIZED:
CELERY_BROKER_URL = REDIS_URL
CELERY_RESULT_BACKEND = REDIS_URL
else:
CELERY_RESULT_BACKEND = broker_url
CELERY_BROKER_URL = broker_url