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

Merge pull request #1690 from edx/jarv/static-url

Browse Source 
allow override for STATIC_URL
This commit is contained in:
John Jarvis
2013-11-18 08:50:13 -08:00
parent e1cc87c8d2 5ec77010e3
commit 7f0ba1b713
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cms/envs/aws.py
View File

@@ -86,6 +86,9 @@ 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 = ENV_TOKENS.get('STATIC_URL', STATIC_URL)
# STATIC_ROOT specifies the directory where static files are
# collected

3
lms/envs/aws.py
View File

@@ -108,6 +108,9 @@ 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)
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)