Merge pull request #5190 from learningequality/revert-5189-master

Revert "allow for CONTENT_ROOT to be set with an environment variable,"
learningequality · Jun 28, 2016 · d0c9e5c · d0c9e5c
2 parents 0cab5a8 + f82b501
commit d0c9e5c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/kalite/settings/base.py b/kalite/settings/base.py
@@ -281,7 +281,7 @@
 # database with assessment items.
 
 # Content path-related settings
-CONTENT_ROOT = os.getenv('KALITE_CONTENT_ROOT', os.path.realpath(getattr(local_settings, "CONTENT_ROOT", os.path.join(USER_DATA_ROOT, 'content'))))
+CONTENT_ROOT = os.path.realpath(getattr(local_settings, "CONTENT_ROOT", os.path.join(USER_DATA_ROOT, 'content')))
 if not os.path.exists(CONTENT_ROOT):
     os.makedirs(CONTENT_ROOT)
 CONTENT_URL = getattr(local_settings, "CONTENT_URL", "/content/")