Merge pull request #472 from edx/jarv/static-url-base

Jarv/static url base

playbooks/roles/edxapp/defaults/main.yml

@@ -108,7 +108,7 @@ EDXAPP_MKTG_URL_LINK_MAP: {}
 # Set this sets the url for static files
 # Override this var to use a CDN
 # Example: xxxxx.cloudfront.net/static/
-EDXAPP_STATIC_URL: "/static/"
+EDXAPP_STATIC_URL_BASE: "/static/"
 
 #-------- Everything below this line is internal to the role ------------
 
@@ -262,7 +262,7 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
   CELERY_BROKER_PASSWORD: $EDXAPP_CELERY_PASSWORD
 
 generic_env_config:  &edxapp_generic_env
-  STATIC_URL: $EDXAPP_STATIC_URL
+  STATIC_URL_BASE: $EDXAPP_STATIC_URL_BASE
   STATIC_ROOT_BASE: $edxapp_staticfile_dir
   LMS_BASE: $EDXAPP_LMS_BASE
   CMS_BASE: $EDXAPP_CMS_BASE

util/jenkins/ansible-provision.sh

@@ -28,8 +28,8 @@ else
     source "$WORKSPACE/util/jenkins/ascii-convert.sh"
 fi
 
-if [[ -z $static_url ]]; then
-  static_url="/static/"
+if [[ -z $static_url_base ]]; then
+  static_url_base="/static"
 fi
 
 if [[ -z $github_username  ]]; then

util/jenkins/create-var-file.sh

@@ -31,5 +31,5 @@ discern_version: $discern_version
 rabbitmq_ip: "127.0.0.1"
 rabbitmq_refresh: True
 COMMON_HOSTNAME: edx-server
-EDXAPP_STATIC_URL: $static_url
+EDXAPP_STATIC_URL_BASE: $static_url_base
 EOF