Merge pull request openedx#171 from appsembler/appsembler/ficus/hotfi…

…x/cms-media-root specify media root in CMS and allow http scheme in aws_appsembler by env token
gymnasium · Oct 6, 2017 · f6f97d8 · f6f97d8
2 parents aab9f3e + 6294d66
commit f6f97d8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/cms/envs/aws_appsembler.py b/cms/envs/aws_appsembler.py
@@ -89,3 +89,9 @@
     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/'
+
+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
@@ -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'