From a6125ae80afa4f3a3b7fb5d5e16f47024156c551 Mon Sep 17 00:00:00 2001
From: Saibotk <git@saibotk.de>
Date: Thu, 6 Jul 2023 17:44:07 +0200
Subject: [PATCH] mastodon: Upgrade to 4.1.3 & adjust nginx config

---
 roles/mastodon/defaults/main.yml      |  2 +-
 roles/mastodon/templates/default.conf | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/roles/mastodon/defaults/main.yml b/roles/mastodon/defaults/main.yml
index 4750b0d..4d68fd3 100644
--- a/roles/mastodon/defaults/main.yml
+++ b/roles/mastodon/defaults/main.yml
@@ -52,7 +52,7 @@ mastodon_elasticsearch_adjust_sysctl: true
 
 # Container versions
 # renovate: depName=docker.io/tootsuite/mastodon
-mastodon_version: 4.1.2
+mastodon_version: 4.1.3
 # renovate: depName=docker.io/library/postgres
 mastodon_database_version: 15.3
 # renovate: depName=docker.io/library/redis
diff --git a/roles/mastodon/templates/default.conf b/roles/mastodon/templates/default.conf
index 7cd6be8..d8620a1 100644
--- a/roles/mastodon/templates/default.conf
+++ b/roles/mastodon/templates/default.conf
@@ -14,7 +14,7 @@ server {
 
   keepalive_timeout    70;
   sendfile             on;
-  client_max_body_size 80m;
+  client_max_body_size 99m;
 
   root /usr/share/nginx/html/;
 
@@ -28,21 +28,21 @@ server {
   gzip_comp_level 6;
   gzip_buffers 16 8k;
   gzip_http_version 1.1;
-  gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
+  gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/svg+xml image/x-icon;
 
-  add_header Strict-Transport-Security "max-age=31536000";
+  add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
 
   location / {
     try_files $uri @proxy;
   }
 
-  location ~ ^/(emoji|packs|system/accounts/avatars|system/media_attachments/files) {
-    add_header Cache-Control "public, max-age=31536000, immutable";
+  location ~ ^/(assets|avatars|emoji|headers|packs|shortcuts|sounds|system)/ {
+    add_header Cache-Control "public, max-age=2419200, must-revalidate";
     try_files $uri @proxy;
   }
 
   location /sw.js {
-    add_header Cache-Control "public, max-age=0";
+    add_header Cache-Control "public, max-age=604800, must-revalidate";
     try_files $uri @proxy;
   }