From 8c9aa7d3f3e1692ed48a73f3aa898d3d9c1aa340 Mon Sep 17 00:00:00 2001 From: Brandon DeRosier Date: Wed, 9 Nov 2016 12:14:42 -0500 Subject: [PATCH] Allow configuring TLS for celery broker --- cms/envs/aws.py | 1 + cms/envs/yaml_config.py | 1 + lms/envs/aws.py | 1 + lms/envs/yaml_config.py | 1 + 4 files changed, 4 insertions(+) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 17c96c490b..d3c1f14cad 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -371,6 +371,7 @@ BROKER_URL = "{0}://{1}:{2}@{3}/{4}".format(CELERY_BROKER_TRANSPORT, CELERY_BROKER_PASSWORD, CELERY_BROKER_HOSTNAME, CELERY_BROKER_VHOST) +BROKER_USE_SSL = ENV_TOKENS.get('CELERY_BROKER_USE_SSL', False) # Event tracking TRACKING_BACKENDS.update(AUTH_TOKENS.get("TRACKING_BACKENDS", {})) diff --git a/cms/envs/yaml_config.py b/cms/envs/yaml_config.py index 3fddb8dda8..90175eede4 100644 --- a/cms/envs/yaml_config.py +++ b/cms/envs/yaml_config.py @@ -247,6 +247,7 @@ BROKER_URL = "{0}://{1}:{2}@{3}/{4}".format(CELERY_BROKER_TRANSPORT, CELERY_BROKER_PASSWORD, CELERY_BROKER_HOSTNAME, CELERY_BROKER_VHOST) +BROKER_USE_SSL = ENV_TOKENS.get('CELERY_BROKER_USE_SSL', False) ######################## CUSTOM COURSES for EDX CONNECTOR ###################### if FEATURES.get('CUSTOM_COURSES_EDX'): diff --git a/lms/envs/aws.py b/lms/envs/aws.py index e00eef54c2..24b1727cae 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -583,6 +583,7 @@ BROKER_URL = "{0}://{1}:{2}@{3}/{4}".format(CELERY_BROKER_TRANSPORT, CELERY_BROKER_PASSWORD, CELERY_BROKER_HOSTNAME, CELERY_BROKER_VHOST) +BROKER_USE_SSL = ENV_TOKENS.get('CELERY_BROKER_USE_SSL', False) # upload limits STUDENT_FILEUPLOAD_MAX_SIZE = ENV_TOKENS.get("STUDENT_FILEUPLOAD_MAX_SIZE", STUDENT_FILEUPLOAD_MAX_SIZE) diff --git a/lms/envs/yaml_config.py b/lms/envs/yaml_config.py index e5552784e1..eaf505f33e 100644 --- a/lms/envs/yaml_config.py +++ b/lms/envs/yaml_config.py @@ -292,6 +292,7 @@ BROKER_URL = "{0}://{1}:{2}@{3}/{4}".format(CELERY_BROKER_TRANSPORT, CELERY_BROKER_PASSWORD, CELERY_BROKER_HOSTNAME, CELERY_BROKER_VHOST) +BROKER_USE_SSL = ENV_TOKENS.get('CELERY_BROKER_USE_SSL', False) # Grades download GRADES_DOWNLOAD_ROUTING_KEY = HIGH_MEM_QUEUE