|
 |
80da83e |
diff --git a/server/odcs/server/celery_tasks.py b/server/odcs/server/celery_tasks.py
|
|
|
80da83e |
index cb0926c..7a94077 100644
|
|
|
80da83e |
--- a/server/odcs/server/celery_tasks.py
|
|
|
80da83e |
+++ b/server/odcs/server/celery_tasks.py
|
|
|
80da83e |
@@ -73,10 +73,21 @@ if broker_url.startswith("amqps://"):
|
|
|
80da83e |
|
|
|
80da83e |
ssl_ctx = {}
|
|
|
80da83e |
|
|
|
80da83e |
- broker_use_ssl = {
|
|
|
80da83e |
- "server_hostname": host,
|
|
|
80da83e |
- "context": {"purpose": ssl.Purpose.SERVER_AUTH},
|
|
|
80da83e |
- }
|
|
|
80da83e |
+ # Set the server_hostname only if it's configured in the CELERY_CONFIG,
|
|
|
80da83e |
+ # otherwise Celery uses SNI everytime even if we don't need it.
|
|
|
80da83e |
+ if "server_hostname" in conf.celery_config:
|
|
|
80da83e |
+ broker_use_ssl = {
|
|
|
80da83e |
+ "server_hostname": host,
|
|
|
80da83e |
+ "context": {"purpose": ssl.Purpose.SERVER_AUTH},
|
|
|
80da83e |
+ }
|
|
|
80da83e |
+ else:
|
|
|
80da83e |
+ broker_use_ssl = {}
|
|
|
80da83e |
+
|
|
|
80da83e |
+ # Allow setting certificates using the CELERY_CONFIG.
|
|
|
80da83e |
+ for key in ["ca_certs", "keyfile", "certfile"]:
|
|
|
80da83e |
+ if key in conf.celery_config:
|
|
|
80da83e |
+ broker_use_ssl[key] = conf.celery_config[key]
|
|
|
80da83e |
+
|
|
|
80da83e |
conf.celery_config.update({"broker_use_ssl": broker_use_ssl})
|
|
|
80da83e |
broker_url = broker_url.replace("amqps://", "amqp://")
|
|
|
80da83e |
|