Merge pull request #4607 from edx/jibsheet/static-url-base

Add a static url base for LMS and CMS separately

CHANGELOG.md

@@ -4,6 +4,7 @@
 - Role: edxapp
   - EDXAPP_NGINX_SKIP_ENABLE_SITES added to allow you to not sync in the lms or cms nginx configuration.  Instead you can enable them during deployment.
   - EDXAPP_NGINX_DEFAULT_SITES added to allow you to mark both lms and cms as defaults, best paired with picking which site to enable during deployment.
+  - EDXAPP_LMS_STATIC_URL_BASE and EDXAPP_CMS_STATIC_URL_BASE allow a per-application setting of the static URL.  You can stil use EDXAPP_STATIC_URL_BASE for now but we may retire that as we continue to separate LMS and CMS.
 
 - Role: XQueue
   - Convert to a yaml config (instead of xqueue.auth.json and xqueue.env.json we get xqueue.yml and it lives by default in /edx/etc/xqueue.yml like standard IDAs)

playbooks/roles/edxapp/defaults/main.yml

@@ -392,16 +392,23 @@ EDXAPP_ID_VERIFICATION_SUPPORT_LINK: ''
 EDXAPP_ACTIVATION_EMAIL_SUPPORT_LINK: ''
 EDXAPP_PASSWORD_RESET_SUPPORT_LINK: ''
 EDXAPP_EDXMKTG_USER_INFO_COOKIE_NAME: "edx-user-info"
-# Set this sets the url for static files
-# Override this var to use a CDN
-# Example: xxxxx.cloudfront.net/static/
-EDXAPP_STATIC_URL_BASE: "/static/"
 
 # Settings for Grade downloads
 EDXAPP_GRADE_STORAGE_CLASS: 'django.core.files.storage.FileSystemStorage'
 EDXAPP_GRADE_STORAGE_KWARGS:
   location: /tmp/edx-s3/grades
 
+# These set the url for static files
+# Override this var to use a CDN
+# Example: http://xxxxx.cloudfront.net/static/
+
+# Default variable, likely to be retired since LMS and CMS are being separated
+EDXAPP_STATIC_URL_BASE: "/static/"
+# If you would like LMS to use a different CDN or path
+EDXAPP_LMS_STATIC_URL_BASE: "{{ EDXAPP_STATIC_URL_BASE }}"
+# If you would like Studio to use a different CDN or path
+EDXAPP_CMS_STATIC_URL_BASE: "{{ EDXAPP_STATIC_URL_BASE }}"
+
 # Credit card processor
 # These are the same defaults set in common.py
 # These are used for shopping cart
@@ -1113,7 +1120,6 @@ generic_env_config:  &edxapp_generic_env
     STORAGE_TYPE: "{{ EDXAPP_GRADE_STORAGE_TYPE | default(None) }}"
     BUCKET: "{{ EDXAPP_GRADE_BUCKET | default(None) }}"
     ROOT_PATH: "{{ EDXAPP_GRADE_ROOT_PATH | default(None) }}"
-  STATIC_URL_BASE: "{{ EDXAPP_STATIC_URL_BASE }}"
   STATIC_ROOT_BASE: "{{ edxapp_staticfile_dir }}"
   LMS_BASE: "{{ EDXAPP_LMS_BASE }}"
   CMS_BASE: "{{ EDXAPP_CMS_BASE }}"
@@ -1373,6 +1379,7 @@ lms_env_config:
   ENTERPRISE_TAGLINE: "{{ EDXAPP_ENTERPRISE_TAGLINE }}"
   ANALYTICS_API_URL: "{{ EDXAPP_LMS_ANALYTICS_API_URL }}"
   GOOGLE_SITE_VERIFICATION_ID: "{{ EDXAPP_GOOGLE_SITE_VERIFICATION_ID }}"
+  STATIC_URL_BASE: "{{ EDXAPP_LMS_STATIC_URL_BASE }}"
 
 cms_auth_config:
   <<: *edxapp_generic_auth
@@ -1412,6 +1419,7 @@ cms_env_config:
   CELERY_QUEUES: "{{ EDXAPP_CMS_CELERY_QUEUES }}"
   ALTERNATE_WORKER_QUEUES: "lms"
   COURSE_IMPORT_EXPORT_BUCKET: "{{ EDXAPP_IMPORT_EXPORT_BUCKET }}"
+  STATIC_URL_BASE: "{{ EDXAPP_CMS_STATIC_URL_BASE }}"
 
 # install dir for the edx-platform repo
 edxapp_code_dir: "{{ edxapp_app_dir }}/edx-platform"