From 25c6f9455bf54da773549286fa14fe716b2667b8 Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Wed, 23 Oct 2013 10:28:09 -0400 Subject: [PATCH 1/2] fixes static_root override --- cms/envs/aws.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 93ad2e52a6..40694677a7 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -88,7 +88,10 @@ with open(CONFIG_ROOT / CONFIG_PREFIX + "env.json") as env_file: # STATIC_ROOT specifies the directory where static files are # collected -STATIC_ROOT = path(ENV_TOKENS.get('STATIC_ROOT', STATIC_ROOT)) / git.revision + +STATIC_ROOT_BASE = ENV_TOKENS.get('STATIC_ROOT_BASE', None) +If STATIC_ROOT_BASE: + STATIC_ROOT = path(STATIC_ROOT_BASE) / git.revision EMAIL_BACKEND = ENV_TOKENS.get('EMAIL_BACKEND', EMAIL_BACKEND) EMAIL_FILE_PATH = ENV_TOKENS.get('EMAIL_FILE_PATH', None) From 68d31b9808374da3abc299ada23bf87eb89a23a7 Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Wed, 23 Oct 2013 10:30:05 -0400 Subject: [PATCH 2/2] adding STATIC_ROOT_BASE to lms/envs/aws.py --- cms/envs/aws.py | 2 +- lms/envs/aws.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 40694677a7..2e53a555a5 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -90,7 +90,7 @@ with open(CONFIG_ROOT / CONFIG_PREFIX + "env.json") as env_file: # collected STATIC_ROOT_BASE = ENV_TOKENS.get('STATIC_ROOT_BASE', None) -If STATIC_ROOT_BASE: +if STATIC_ROOT_BASE: STATIC_ROOT = path(STATIC_ROOT_BASE) / git.revision EMAIL_BACKEND = ENV_TOKENS.get('EMAIL_BACKEND', EMAIL_BACKEND) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 436563913a..7a32916c44 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -104,7 +104,9 @@ with open(CONFIG_ROOT / CONFIG_PREFIX + "env.json") as env_file: # STATIC_ROOT specifies the directory where static files are # collected -STATIC_ROOT = path(ENV_TOKENS.get('STATIC_ROOT', STATIC_ROOT)) +STATIC_ROOT_BASE = ENV_TOKENS.get('STATIC_ROOT_BASE', None) +if STATIC_ROOT_BASE: + STATIC_ROOT = path(STATIC_ROOT_BASE) 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