Merge branch 'features/runuwsgi-static-config' into 'master'

[uWSGI] Make serving of /static configurable

See merge request !528

aleksis/core/settings.py

@@ -66,6 +66,8 @@ DEBUG_TOOLBAR_PANELS = [
 UWSGI = {
     "module": "aleksis.core.wsgi",
 }
+UWSGI_SERVE_STATIC = True
+UWSGI_SERVE_MEDIA = True
 
 ALLOWED_HOSTS = _settings.get("http.allowed_hosts", [])
 

aleksis/core/urls.py

 from django.apps import apps
 from django.conf import settings
-from django.conf.urls.static import static
 from django.contrib import admin
 from django.contrib.auth import views as auth_views
 from django.urls import include, path
@@ -199,13 +198,6 @@ urlpatterns = [
     ),
 ]
 
-# Serve static files from STATIC_ROOT to make it work with runserver
-# collectstatic is also required in development for this
-urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
-
-# Serve media files from MEDIA_ROOT to make it work with runserver
-urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
-
 # Add URLs for optional features
 if hasattr(settings, "TWILIO_ACCOUNT_SID"):
     from two_factor.gateways.twilio.urls import urlpatterns as tf_twilio_urls  # noqa

poetry.lock

@@ -1053,7 +1053,7 @@ yubikey = ["django-otp-yubikey"]
 
 [[package]]
 name = "django-uwsgi-ng"
-version = "1.0.2"
+version = "1.1.0"
 description = "uWSGI stuff for Django projects"
 category = "main"
 optional = false
@@ -2416,7 +2416,7 @@ ldap = ["django-auth-ldap"]
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "f03e33046fabe4d97c3ad3f4146a36007ff8b8d0c3a374d6f63f1d19ade08687"
+content-hash = "54320b0755855f08a6b304d526ca62a4650e269513bd2460b348ffa47ef81250"
 
 [metadata.files]
 alabaster = [
@@ -2803,7 +2803,7 @@ django-two-factor-auth = [
     {file = "django_two_factor_auth-1.13-py2.py3-none-any.whl", hash = "sha256:afb60e62f22b1f29a568666c0444ab05cabe8acc4d7c54d833d67f7b50f842fd"},
 ]
 django-uwsgi-ng = [
-    {file = "django-uwsgi-ng-1.0.2.tar.gz", hash = "sha256:e53267e22b052eb862b5a2f84827a9d763f1ae5449e16815b086128bf2e78190"},
+    {file = "django-uwsgi-ng-1.1.0.tar.gz", hash = "sha256:ea6485b5f33acd6721dff3008ad4e20f9ec311555dad2a37e0c47fa360b0fcc5"},
 ]
 django-widget-tweaks = [
     {file = "django-widget-tweaks-1.4.8.tar.gz", hash = "sha256:9f91ca4217199b7671971d3c1f323a2bec71a0c27dec6260b3c006fa541bc489"},

pyproject.toml

@@ -93,7 +93,7 @@ django-prometheus = "^2.1.0"
 importlib-metadata = {version = "^3.0.0", python = "<3.9"}
 django-model-utils = "^4.0.0"
 bs4 = "^0.0.1"
-django-uwsgi-ng = "^1.0.2"
+django-uwsgi-ng = "^1.1.0"
 django-extensions = "^3.1.1"
 ipython = "^7.20.0"
 django-redis = "^4.12.1"