From da010704557667c5438e5068ceeec7066f0163d3 Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Fri, 8 Dec 2023 13:46:32 +0000
Subject: [PATCH] fix(nginx): Do not cache all requests for a day in the
 reverse proxy

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2673>
---
 changes/changelog.d/2258.bugfix | 1 +
 deploy/docker.proxy.template    | 1 -
 templates/nginx.conf.j2         | 2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 changes/changelog.d/2258.bugfix

diff --git a/changes/changelog.d/2258.bugfix b/changes/changelog.d/2258.bugfix
new file mode 100644
index 000000000..43c899612
--- /dev/null
+++ b/changes/changelog.d/2258.bugfix
@@ -0,0 +1 @@
+Do not cache all requests to avoid missing updates #2258
diff --git a/deploy/docker.proxy.template b/deploy/docker.proxy.template
index 1d470b1b9..ff9d5e4fe 100644
--- a/deploy/docker.proxy.template
+++ b/deploy/docker.proxy.template
@@ -78,7 +78,6 @@ server {
     # end of compression settings
 
     location / {
-        expires 1d;
         include /etc/nginx/funkwhale_proxy.conf;
         proxy_pass http://fw;
     }
diff --git a/templates/nginx.conf.j2 b/templates/nginx.conf.j2
index 6dca6c1f4..503d7abcb 100644
--- a/templates/nginx.conf.j2
+++ b/templates/nginx.conf.j2
@@ -159,7 +159,9 @@ server {
 {% endif %}
 
     location / {
+{% if not config.reverse_proxy %}
         expires 1d;
+{% endif %}
         include /etc/nginx/funkwhale_proxy.conf;
 {% if config.proxy_frontend and not config.reverse_proxy %}
         proxy_pass http://funkwhale-front;