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 09:01:43 -0400 |
| commit | a62b640f7d3a0b90c4009cc7efe0a19fd3ad0bfa (patch) | |
| tree | 4d7104bffc4a0f33fe8cff461a58bc913c6af57b /docs/ref | |
| parent | 2a14c08e71330827f44acc53708194bf6aadee47 (diff) | |
[1.6.x] Fixed #20973 -- Document serving static files without django.contrib.staticfiles
Backport of 7b04038a7f from master
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 e47e8708b0..b40b5389d3 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1411,6 +1411,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 @@ -1424,6 +1432,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 |