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

Jarv/fix static root

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)

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