From 21eaaf1f4d3838359efccc1291cd768b862a6deb Mon Sep 17 00:00:00 2001
From: JuniorJPDJ <git@juniorjpdj.pl>
Date: Tue, 26 Jul 2022 21:25:14 +0000
Subject: [PATCH] fix(front/Docker): fixup of issue introduced in !1897

---
 changes/changelog.d/1919.fix         | 1 +
 front/docker/funkwhale.conf.template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changes/changelog.d/1919.fix

diff --git a/changes/changelog.d/1919.fix b/changes/changelog.d/1919.fix
new file mode 100644
index 000000000..dcf504cc9
--- /dev/null
+++ b/changes/changelog.d/1919.fix
@@ -0,0 +1 @@
+Fix media directory nginx routing error in front docker container introduced in !1897
diff --git a/front/docker/funkwhale.conf.template b/front/docker/funkwhale.conf.template
index bf9e35f7c..61d5b870b 100644
--- a/front/docker/funkwhale.conf.template
+++ b/front/docker/funkwhale.conf.template
@@ -75,9 +75,9 @@ server {
     # has been checked on API side.
     # Comment the "NON-S3" commented lines and uncomment "S3" commented lines
     # if you're storing media files in a S3 bucket.
-    location /_protected/media/(.+) {
+    location ~ /_protected/media/(.+) {
         internal;
-        alias   ${MEDIA_ROOT}/;                                             # NON-S3
+        alias   ${MEDIA_ROOT}/$1;                                           # NON-S3
         # Needed to ensure DSub auth isn't forwarded to S3/Minio, see #932.
 #       proxy_set_header Authorization "";                                  # S3
 #       proxy_pass $1;                                                      # S3