updated with minor fixes requested

playbooks/roles/edxapp/defaults/main.yml

@@ -660,8 +660,8 @@ EDXAPP_BLOCK_STRUCTURES_SETTINGS:
 EDXAPP_PARENTAL_CONSENT_AGE_LIMIT: 13
 
 # Scorm Xblock configurations
-EDXAPP_SCORM_PKG_STORAGE_DIR: ""
-EDXAPP_SCORM_PLAYER_LOCAL_STORAGE_ROOT: ""
+EDXAPP_SCORM_PKG_STORAGE_DIR: !!null
+EDXAPP_SCORM_PLAYER_LOCAL_STORAGE_ROOT: !!null
 
 #-------- Everything below this line is internal to the role ------------
 

playbooks/roles/nginx/templates/edx/app/nginx/sites-available/extra_locations_lms.j2

 {% if EDXAPP_SCORM_PKG_STORAGE_DIR %}
-    location ~ ^/{{ EDXAPP_MEDIA_URL }}/{{ EDXAPP_XBLOCK_SETTINGS.ScormXBlock.SCORM_PKG_STORAGE_DIR or EDXAPP_SCORM_PKG_STORAGE_DIR}}/(?P<file>.*) {
+    location ~ ^/{{ EDXAPP_MEDIA_URL }}/{{ EDXAPP_SCORM_PKG_STORAGE_DIR }}/(?P<file>.*) {
         add_header 'Access-Control-Allow-Origin' $cors_origin;
         add_header 'Access-Control-Allow-Credentials' 'true';
         add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
 
-        root {{ edxapp_media_dir }}/{{ EDXAPP_XBLOCK_SETTINGS.ScormXBlock.SCORM_PKG_STORAGE_DIR or EDXAPP_SCORM_PKG_STORAGE_DIR}};
+        root {{ edxapp_media_dir }}/{{ EDXAPP_SCORM_PKG_STORAGE_DIR }};
         try_files /$file =404;
         expires 31536000s;
     }

playbooks/roles/nginx/templates/edx/app/nginx/sites-available/lms.j2

@@ -44,7 +44,7 @@ geo $http_x_forwarded_for $embargo {
 {%- endif %}
 
 
-{% if EDXAPP_CORS_ORIGIN_WHITELIST %}
+{% if EDXAPP_CORS_ORIGIN_WHITELIST|length > 0​ %}
   # The Origin request header indicates where a fetch originates from. It doesn't include any path information,
   # but only the server name (e.g. https://www.example.com).
   # See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Origin for details.

playbooks/roles/nginx/templates/edx/app/nginx/sites-available/static-files-extra.j2

 {% if EDXAPP_SCORM_PLAYER_LOCAL_STORAGE_ROOT %}
   # w/in scorm/, override default return 403 for these file types
   location ~ ^/static/scorm/(?:.*)(?:\.xml|\.json) {
-      try_files /{{ EDXAPP_XBLOCK_SETTINGS.ScormXBlock.SCORM_PLAYER_LOCAL_STORAGE_ROOT or EDXAPP_SCORM_PLAYER_LOCAL_STORAGE_ROOT}}/$file =404;
+      try_files /{{ EDXAPP_SCORM_PLAYER_LOCAL_STORAGE_ROOT }}/$file =404;
   }
 
   location ~ "/scorm/(?P<file>.*)" {
     add_header 'Access-Control-Allow-Origin' $cors_origin;
     add_header 'Access-Control-Allow-Credentials' 'true';
     add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-    try_files /{{ EDXAPP_XBLOCK_SETTINGS.ScormXBlock.SCORM_PLAYER_LOCAL_STORAGE_ROOT or EDXAPP_SCORM_PLAYER_LOCAL_STORAGE_ROOT}}/$file =404;
+    try_files /{{ EDXAPP_SCORM_PLAYER_LOCAL_STORAGE_ROOT }}/$file =404;
   }
 {% endif %}