From 42e1991953a11a8e05be1706b7c0bf15f923259a Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Mon, 21 Oct 2013 14:39:34 -0400 Subject: [PATCH 1/3] adding STATIC_ROOT --- lms/envs/aws.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index aa5f1cbf48..436563913a 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -102,6 +102,10 @@ CELERY_QUEUES = { with open(CONFIG_ROOT / CONFIG_PREFIX + "env.json") as env_file: ENV_TOKENS = json.load(env_file) +# STATIC_ROOT specifies the directory where static files are +# collected +STATIC_ROOT = path(ENV_TOKENS.get('STATIC_ROOT', STATIC_ROOT)) + 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 CC_MERCHANT_NAME = ENV_TOKENS.get('CC_MERCHANT_NAME', PLATFORM_NAME) From 8ca156bd00a25695544baa1029672cecadbda15d Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Mon, 21 Oct 2013 14:41:00 -0400 Subject: [PATCH 2/3] adding STATIC_ROOT to cms --- cms/envs/aws.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 575a0dd8f2..1e886255a4 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -85,6 +85,10 @@ CELERY_QUEUES = { with open(CONFIG_ROOT / CONFIG_PREFIX + "env.json") as env_file: ENV_TOKENS = json.load(env_file) +# STATIC_ROOT specifies the directory where static files are +# collected +STATIC_ROOT = path(ENV_TOKENS.get('STATIC_ROOT', STATIC_ROOT)) + EMAIL_BACKEND = ENV_TOKENS.get('EMAIL_BACKEND', EMAIL_BACKEND) EMAIL_FILE_PATH = ENV_TOKENS.get('EMAIL_FILE_PATH', None) LMS_BASE = ENV_TOKENS.get('LMS_BASE') From 1ac732abb475fd14962bf3a593325b2ccee117d8 Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Tue, 22 Oct 2013 12:08:48 -0400 Subject: [PATCH 3/3] adding git.revision for cms --- 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 1e886255a4..93ad2e52a6 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -13,6 +13,7 @@ from logsettings import get_logger_config import os from path import path +from dealer.git import git # SERVICE_VARIANT specifies name of the variant used, which decides what JSON # configuration files are read during startup. @@ -87,7 +88,7 @@ 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 = path(ENV_TOKENS.get('STATIC_ROOT', STATIC_ROOT)) / git.revision EMAIL_BACKEND = ENV_TOKENS.get('EMAIL_BACKEND', EMAIL_BACKEND) EMAIL_FILE_PATH = ENV_TOKENS.get('EMAIL_FILE_PATH', None)