yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-06 02:49:56 +02:00
Code Issues Releases Wiki Activity

Fix #947: Make media and static files serving more reliable when reverse proxy X_FORWARDED_* headers are incorrect

Browse source
This commit is contained in:
Eliot Berriot 2019-11-26 16:42:42 +01:00
parent 7c6855d915
commit 8a9f7845d4
No known key found for this signature in database
GPG key ID: 6B501DFD73514E14
5 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
api/config/settings/common.py
View file

@ -354,7 +354,7 @@ CRISPY_TEMPLATE_PACK = "bootstrap3"
STATIC_ROOT = env("STATIC_ROOT", default=str(ROOT_DIR("staticfiles")))
# See: https://docs.djangoproject.com/en/dev/ref/settings/#static-url
STATIC_URL = env("STATIC_URL", default="/staticfiles/")
STATIC_URL = env("STATIC_URL", default=FUNKWHALE_URL + "/staticfiles/")
DEFAULT_FILE_STORAGE = "funkwhale_api.common.storage.ASCIIFileSystemStorage"
PROXY_MEDIA = env.bool("PROXY_MEDIA", default=True)
@ -391,7 +391,7 @@ STATICFILES_FINDERS = (
MEDIA_ROOT = env("MEDIA_ROOT", default=str(APPS_DIR("media")))
# See: https://docs.djangoproject.com/en/dev/ref/settings/#media-url
MEDIA_URL = env("MEDIA_URL", default="/media/")
MEDIA_URL = env("MEDIA_URL", default=FUNKWHALE_URL + "/media/")
FILE_UPLOAD_PERMISSIONS = 0o644
ATTACHMENTS_UNATTACHED_PRUNE_DELAY = env.int(