Merge pull request cfpb#2286 from cfpb/add-media-root-env-var

Allow MEDIA_ROOT to be set by environment
kurtrwall · Aug 10, 2016 · 6d57fbb · 6d57fbb
2 parents 192228b + fc29b9b
commit 6d57fbb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.env_SAMPLE b/.env_SAMPLE
@@ -11,6 +11,12 @@ export DJANGO_STAGING_HOSTNAME='content.localhost'
 #export DJANGO_STATIC_ROOT=<path_to_static_files>
 export DJANGO_HTTP_PORT=8000
 
+##################################
+# Django Media Storage (optional).
+##################################
+
+# export MEDIA_ROOT=<path_to_media_root>
+
 #############################################
 # V1 - application feature related variables.
 #############################################

diff --git a/cfgov/cfgov/settings/base.py b/cfgov/cfgov/settings/base.py
@@ -177,7 +177,8 @@
 # Absolute path to the directory static files should be collected to.
 STATIC_ROOT = os.environ.get('DJANGO_STATIC_ROOT', '/var/www/html/static')
 
-MEDIA_ROOT = os.path.join(PROJECT_ROOT, 'f')
+MEDIA_ROOT = os.environ.get('MEDIA_ROOT', 
+                            os.path.join(PROJECT_ROOT, 'f'))
 MEDIA_URL = '/f/'
 
 # List of finder classes that know how to find static files in