repos/website
1
Fork 0
Code Issues 1 Pull requests 27 Activity

Ensure media is served by Django

Browse source
This commit is contained in:
Jake Howard 2022-09-04 17:23:41 +01:00
parent 79d6c1e951
commit ddb68f7d43
Signed by: jake
GPG key ID: 57AFB45680EDD477
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
website/urls.py
View file

@ -1,6 +1,9 @@
import re
from django.conf import settings from django.conf import settings
from django.urls import include, path, re_path from django.urls import include, path, re_path
from django.views.decorators.cache import cache_page from django.views.decorators.cache import cache_control, cache_page
from django.views.static import serve
from wagtail import urls as wagtail_urls from wagtail import urls as wagtail_urls
from wagtail.admin import urls as wagtailadmin_urls from wagtail.admin import urls as wagtailadmin_urls
from wagtail.contrib.sitemaps.views import sitemap from wagtail.contrib.sitemaps.views import sitemap
@ -33,6 +36,12 @@ urlpatterns = [
path("", include("website.legacy.urls")), path("", include("website.legacy.urls")),
path("api/", include("website.api.urls")), path("api/", include("website.api.urls")),
path("", include(favicon_urls)), path("", include(favicon_urls)),
# Some say it's a bad idea to serve media with Django - I don't care
re_path(
r"^%s(?P<path>.*)$" % re.escape(settings.MEDIA_URL.lstrip("/")),
cache_control(max_age=60 * 60)(serve),
{"document_root": settings.MEDIA_ROOT},
),
] ]
@ -41,11 +50,6 @@ if not settings.DEBUG:
if settings.DEBUG: if settings.DEBUG:
from django.conf.urls.static import static
# Serve media files from development server
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
# Add django-browser-reload # Add django-browser-reload
urlpatterns.append(path("__reload__/", include("django_browser_reload.urls"))) urlpatterns.append(path("__reload__/", include("django_browser_reload.urls")))