Update dependency django-minify-html to v1.9.0

.gitlab-ci.yml

@@ -109,6 +109,12 @@ djlint:
   script:
     - djlint website/ --lint --check
 
+gunicorn_check:
+  extends: .python_test_template
+  script:
+    - apt-get update && apt-get install --yes libpq-dev
+    - gunicorn --check-config --config etc/gunicorn.conf.py
+
 npm_lint:
   image: node:20-slim
   stage: test

Dockerfile

@@ -39,14 +39,7 @@ ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLA
 RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz && tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
 
 ENV PATH=$VIRTUAL_ENV/bin:$PATH \
-    PYTHONUNBUFFERED=1 \
-    GRANIAN_INTERFACE=wsgi \
-    GRANIAN_HOST=0.0.0.0 \
-    GRANIAN_PORT=8080 \
-    GRANIAN_WORKERS_LIFETIME=1800 \
-    GRANIAN_RESPAWN_INTERVAL=10 \
-    GRANIAN_PROCESS_NAME=website \
-    GRANIAN_RESPAWN_FAILED_WORKERS=1
+    PYTHONUNBUFFERED=1
 
 EXPOSE 8000
 

etc/crontab

@@ -3,5 +3,4 @@
 @daily ./manage.py update_unsplash_photos
 @daily ./manage.py rebuild_references_index
 @weekly ./manage.py refresh_spotify_playlists
-@weekly ./manage.py prune_db_task_results
 */10 * * * * ./manage.py publish_scheduled_pages

etc/gunicorn.conf.py

@@ -0,0 +1,10 @@
+wsgi_app = "website.wsgi:application"
+disable_redirect_access_to_syslog = True
+preload_app = True
+bind = "127.0.0.1:8080"
+max_requests = 1200
+max_requests_jitter = 50
+forwarded_allow_ips = "*"
+
+# Run additional threads so the GIL isn't sitting completely idle
+threads = 4

etc/s6-rc.d/django/run

@@ -4,4 +4,4 @@ set -e
 
 cd /app
 
-exec granian website.wsgi:application
+exec gunicorn -c etc/gunicorn.conf.py

requirements.txt

@@ -7,7 +7,7 @@ beautifulsoup4[lxml]
 requests
 wagtail-generic-chooser==0.6
 django-redis==5.4.0
-granian[pname]==1.6.0
+gunicorn==22.0.0
 psycopg==3.1.18
 djangorestframework
 django-htmx==1.17.2
@@ -26,9 +26,9 @@ django-permissions-policy==4.18.0
 django-enforce-host==1.1.0
 django-proxy==1.2.2
 wagtail-lite-youtube-embed==0.1.0
-django-minify-html==1.7.1
+django-minify-html==1.9.0
 metadata-parser==0.12.1
-django-tasks==0.5.0
+django-tasks==0.3.0
 lightningcss==0.2.0
 
 # DRF OpenAPI dependencies

website/well_known/templates/well-known/matrix-client.json

@@ -1,5 +1,5 @@
 {
   "m.homeserver": {
-    "base_url": "https://matrix.theorangeone.net"
+    "base_url": "https://matrix.jakehoward.tech"
   }
 }

website/well_known/templates/well-known/matrix-server.json

@@ -1 +1 @@
-{"m.server": "matrix.theorangeone.net:443"}
+{"m.server": "matrix.jakehoward.tech:443"}