From 2bb20b9ab58686d975c9429b12f29a77de5fb478 Mon Sep 17 00:00:00 2001 From: Bryan Wilson Date: Mon, 2 Oct 2017 02:41:19 -0700 Subject: [PATCH 1/2] Specify MEDIA_ROOT, MEDIA_URL in cms env (used for Scorm) --- cms/envs/aws_appsembler.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cms/envs/aws_appsembler.py b/cms/envs/aws_appsembler.py index 751a3fffe2d8..a69b7b7a63be 100644 --- a/cms/envs/aws_appsembler.py +++ b/cms/envs/aws_appsembler.py @@ -89,3 +89,7 @@ del DATABASES['appsembler_usage'] CUSTOM_SSO_FIELDS_SYNC = ENV_TOKENS.get('CUSTOM_SSO_FIELDS_SYNC', {}) + +# set media values for SCORM upload +MEDIA_ROOT = '/edx/var/edxapp/media' +MEDIA_URL = '/media/' From 6294d66721622ce2fbb05576d8a124ae19cfed9f Mon Sep 17 00:00:00 2001 From: Bryan Wilson Date: Mon, 2 Oct 2017 10:40:49 -0700 Subject: [PATCH 2/2] set https off if passing http base scheme in env tokens --- cms/envs/aws_appsembler.py | 2 ++ lms/envs/aws_appsembler.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cms/envs/aws_appsembler.py b/cms/envs/aws_appsembler.py index a69b7b7a63be..8b1d7ec272d2 100644 --- a/cms/envs/aws_appsembler.py +++ b/cms/envs/aws_appsembler.py @@ -93,3 +93,5 @@ # set media values for SCORM upload MEDIA_ROOT = '/edx/var/edxapp/media' MEDIA_URL = '/media/' + +HTTPS = ENV_TOKENS.get('BASE_SCHEME', 'https').lower() == 'http' and 'off' or 'on' diff --git a/lms/envs/aws_appsembler.py b/lms/envs/aws_appsembler.py index 8c3709a6bfc9..2b2345956095 100644 --- a/lms/envs/aws_appsembler.py +++ b/lms/envs/aws_appsembler.py @@ -114,3 +114,5 @@ CORS_REPLACE_HTTPS_REFERER = True CUSTOM_SSO_FIELDS_SYNC = ENV_TOKENS.get('CUSTOM_SSO_FIELDS_SYNC', {}) + +HTTPS = ENV_TOKENS.get('BASE_SCHEME', 'https').lower() == 'http' and 'off' or 'on'