From 8857c40a8d031bbf134fb92f9837ab54668700c2 Mon Sep 17 00:00:00 2001
From: JuniorJPDJ <git@juniorjpdj.pl>
Date: Sat, 5 Nov 2022 19:12:58 +0100
Subject: [PATCH] fix(front): add missing changes to
 front/docker/funkwhale.conf.template and docker/nginx/conf.dev

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2039>
---
 docker/nginx/conf.dev                | 4 ++--
 front/docker/funkwhale.conf.template | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docker/nginx/conf.dev b/docker/nginx/conf.dev
index ef6e672a4..4d60aa7c5 100644
--- a/docker/nginx/conf.dev
+++ b/docker/nginx/conf.dev
@@ -76,14 +76,14 @@ http {
             text/x-cross-domain-policy;
         # end of compression settings
 
-        location / {
+        location /api/ {
             include /etc/nginx/funkwhale_proxy.conf;
             # This is needed if you have file import via upload enabled.
             client_max_body_size ${NGINX_MAX_BODY_SIZE};
             proxy_pass   http://funkwhale-api/;
         }
 
-        location /front/ {
+        location / {
             proxy_pass   http://funkwhale-front/front/;
             expires 1d;
         }
diff --git a/front/docker/funkwhale.conf.template b/front/docker/funkwhale.conf.template
index d3268be22..6ec83eeb1 100644
--- a/front/docker/funkwhale.conf.template
+++ b/front/docker/funkwhale.conf.template
@@ -48,16 +48,17 @@ server {
         text/x-cross-domain-policy;
     # end of compression settings
 
-    location / {
+    location /api/ {
         include /etc/nginx/funkwhale_proxy.conf;
         # This is needed if you have file import via upload enabled.
         client_max_body_size ${NGINX_MAX_BODY_SIZE};
         proxy_pass   http://funkwhale-api/;
     }
 
-    location /front/ {
+    location / {
         alias /usr/share/nginx/html/;
         expires 1d;
+        try_files $uri $uri/ /index.html;
     }
 
     location = /front/embed.html {