Merge branch '817-duplicate-locations-in-nginx-template' into 'develop'

Resolve "Duplicate locations in nginx template"

Closes #817

See merge request funkwhale/funkwhale!753
This commit is contained in:
Eliot Berriot 2019-05-03 09:47:44 +02:00
commit 00169768bc
1 changed files with 1 additions and 8 deletions

View File

@ -109,16 +109,9 @@ server {
# audio files once correct permission / authentication
# has been checked on API side
internal;
}
# this is an internal location that is used to serve
# audio files once correct permission / authentication
# has been checked on API side
location /_protected/media {
internal;
alias ${MEDIA_ROOT};
}
# Comment the previous location and uncomment this one if you're storing
# media files in a S3 bucket
# location ~ /_protected/media/(.+) {