From 46434582c8495623a6c9e76c50d93fa3be449262 Mon Sep 17 00:00:00 2001 From: Albert Liang Date: Thu, 30 Jul 2015 12:46:59 -0700 Subject: [PATCH] Deactivate HTTPS on dev and devstack When running locally, XBlocks which access third-party software no longer cause server errors. Because devstack inherits from aws, the HTTPS flag was implicitly set to 'on'. This meant that XBlocks attempted to use SSL when dealing with third-party components like LTI. Since SSL is not enabled on devstack, this caused server errors whenever these features ran. --- cms/envs/dev.py | 2 ++ cms/envs/devstack.py | 1 + lms/envs/devstack.py | 1 + 3 files changed, 4 insertions(+) diff --git a/cms/envs/dev.py b/cms/envs/dev.py index 7ba5d46121..604a1bf6dc 100644 --- a/cms/envs/dev.py +++ b/cms/envs/dev.py @@ -13,6 +13,8 @@ from lms.envs.dev import (WIKI_ENABLED) DEBUG = True TEMPLATE_DEBUG = DEBUG +HTTPS = 'off' + LOGGING = get_logger_config(ENV_ROOT / "log", logging_env="dev", tracking_filename="tracking.log", diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py index f73b5f915d..70e25475ca 100644 --- a/cms/envs/devstack.py +++ b/cms/envs/devstack.py @@ -11,6 +11,7 @@ MEDIA_ROOT = "/edx/var/edxapp/uploads" DEBUG = True USE_I18N = True TEMPLATE_DEBUG = DEBUG +HTTPS = 'off' ################################ LOGGERS ###################################### diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py index dba5761d41..bb3db23311 100644 --- a/lms/envs/devstack.py +++ b/lms/envs/devstack.py @@ -16,6 +16,7 @@ SITE_NAME = 'localhost:8000' PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', 'Devstack') # By default don't use a worker, execute tasks as if they were local functions CELERY_ALWAYS_EAGER = True +HTTPS = 'off' ################################ LOGGERS ######################################