From 54bb55fa522a5a400ae2b29c1463d07285c94844 Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Tue, 19 Nov 2013 11:35:45 -0500 Subject: [PATCH 1/4] fixes issue where STATIC_URL was overwritten without git.revision fixes this commit - https://github.com/edx/edx-platform/commit/5ec77010e3bc0303cdb06ebf32e806936fd36ce6 --- cms/envs/aws.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 5d17d9c157..e30a9b6f85 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -86,7 +86,11 @@ CELERY_QUEUES = { with open(CONFIG_ROOT / CONFIG_PREFIX + "env.json") as env_file: ENV_TOKENS = json.load(env_file) -# STATIC_URL specifies the url to use for static files +# STATIC_URL_BASE specifies the base url to use for static files +STATIC_URL_BASE = ENV_TOKENS.get('STATIC_URL_BASE', None) +if STATIC_URL_BASE: + STATIC_URL = STATIC_URL_BASE + git.revision + "/" + STATIC_URL = ENV_TOKENS.get('STATIC_URL', STATIC_URL) # GITHUB_REPO_ROOT is the base directory # for course data From 0e6b21ef71ba331f92cdcfb8ed5206f71b733ca3 Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Tue, 19 Nov 2013 11:40:31 -0500 Subject: [PATCH 2/4] adding slash --- cms/envs/aws.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index e30a9b6f85..34ddcbd550 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -89,9 +89,8 @@ with open(CONFIG_ROOT / CONFIG_PREFIX + "env.json") as env_file: # STATIC_URL_BASE specifies the base url to use for static files STATIC_URL_BASE = ENV_TOKENS.get('STATIC_URL_BASE', None) if STATIC_URL_BASE: - STATIC_URL = STATIC_URL_BASE + git.revision + "/" + STATIC_URL = STATIC_URL_BASE + "/" + git.revision + "/" -STATIC_URL = ENV_TOKENS.get('STATIC_URL', STATIC_URL) # GITHUB_REPO_ROOT is the base directory # for course data GITHUB_REPO_ROOT = ENV_TOKENS.get('GITHUB_REPO_ROOT', GITHUB_REPO_ROOT) From 71184220e6c7af8204492162f055b5cc5c7b41c9 Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Tue, 19 Nov 2013 12:25:59 -0500 Subject: [PATCH 3/4] convert STATIC_URL to ascii --- cms/envs/aws.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 34ddcbd550..32a4c97551 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -89,7 +89,8 @@ with open(CONFIG_ROOT / CONFIG_PREFIX + "env.json") as env_file: # STATIC_URL_BASE specifies the base url to use for static files STATIC_URL_BASE = ENV_TOKENS.get('STATIC_URL_BASE', None) if STATIC_URL_BASE: - STATIC_URL = STATIC_URL_BASE + "/" + git.revision + "/" + # collectstatic will fail if STATIC_URL is a unicode string + STATIC_URL = STATIC_URL_BASE.encode('ascii', 'ignore') + "/" + git.revision + "/" # GITHUB_REPO_ROOT is the base directory # for course data From 4067a084eeae06748e1e4798709b7e00ef026444 Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Tue, 19 Nov 2013 13:23:54 -0500 Subject: [PATCH 4/4] STATIC_URL_BASE for lms config --- lms/envs/aws.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index b6e47d6ab1..a1146c6c84 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -108,8 +108,12 @@ STATIC_ROOT_BASE = ENV_TOKENS.get('STATIC_ROOT_BASE', None) if STATIC_ROOT_BASE: STATIC_ROOT = path(STATIC_ROOT_BASE) -# STATIC_URL specifies the url to use for static files -STATIC_URL = ENV_TOKENS.get('STATIC_URL', STATIC_URL) + +# STATIC_URL_BASE specifies the base url to use for static files +STATIC_URL_BASE = ENV_TOKENS.get('STATIC_URL_BASE', None) +if STATIC_URL_BASE: + # collectstatic will fail if STATIC_URL is a unicode string + STATIC_URL = STATIC_URL_BASE.encode('ascii', 'ignore') + "/" PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', PLATFORM_NAME) # For displaying on the receipt. At Stanford PLATFORM_NAME != MERCHANT_NAME, but PLATFORM_NAME is a fine default