diff options
| author | Loic Bistuer <loic.bistuer@sixmedia.com> | 2013-09-01 11:04:32 +0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-09-03 08:59:08 -0400 |
| commit | 7b04038a7f4b291bc05124c4b5300001dc94e13f (patch) | |
| tree | 14f681ff61a92d32e0fbfbd231551ae94db0d187 /docs/ref | |
| parent | dd656073ad80d0e8ec9e9dfea30da75a660d759c (diff) | |
Fixed #20973 -- Document serving static files without django.contrib.staticfiles
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/settings.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index b0bc020f47..a8b629e693 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1448,6 +1448,14 @@ Example: ``"/var/www/example.com/media/"`` See also :setting:`MEDIA_URL`. +.. warning:: + + :setting:`MEDIA_ROOT` and :setting:`STATIC_ROOT` must have different + values. Before :setting:`STATIC_ROOT` was introduced, it was common to + rely or fallback on :setting:`MEDIA_ROOT` to also serve static files; + however, since this can have serious security implications, there is a + validation check to prevent it. + .. setting:: MEDIA_URL MEDIA_URL @@ -1461,6 +1469,11 @@ to a non-empty value. Example: ``"http://media.example.com/"`` +.. warning:: + + :setting:`MEDIA_URL` and :setting:`STATIC_URL` must have different + values. See :setting:`MEDIA_ROOT` for more details. + .. setting:: MIDDLEWARE_CLASSES MIDDLEWARE_CLASSES |