Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1459 from edx/jarv/fix-static-root

Browse Source 
Jarv/fix static root
This commit is contained in:
John Jarvis
2013-10-23 08:01:32 -07:00
parent e1b39774de 68d31b9808
commit cda168dacf
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cms/envs/aws.py
View File

@@ -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)

4
lms/envs/aws.py
View File

@@ -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