From ca9e3c70546921e97d5f704209e65effe5ff4cd9 Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Fri, 2 Dec 2022 14:04:42 +0000
Subject: [PATCH] Remove all /front/ occurences

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2039>
---
 .env.dev                      | 2 +-
 .gitpod/gitpod.env            | 2 +-
 api/config/settings/common.py | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.env.dev b/.env.dev
index 0c81dc506..ca0953da7 100644
--- a/.env.dev
+++ b/.env.dev
@@ -10,7 +10,7 @@ MUSIC_DIRECTORY_PATH=/music
 BROWSABLE_API_ENABLED=True
 FORWARDED_PROTO=http
 LDAP_ENABLED=False
-FUNKWHALE_SPA_HTML_ROOT=http://nginx/front/
+FUNKWHALE_SPA_HTML_ROOT=http://nginx/
 PYTHONTRACEMALLOC=0
 
 # Uncomment this if you're using traefik/https
diff --git a/.gitpod/gitpod.env b/.gitpod/gitpod.env
index 8353ea258..c30ca9276 100644
--- a/.gitpod/gitpod.env
+++ b/.gitpod/gitpod.env
@@ -5,7 +5,7 @@ C_FORCE_ROOT=true
 BROWSABLE_API_ENABLED=True
 FORWARDED_PROTO=http
 LDAP_ENABLED=False
-FUNKWHALE_SPA_HTML_ROOT=http://localhost:8000/front/
+FUNKWHALE_SPA_HTML_ROOT=http://localhost:8000/
 FUNKWHALE_URL=http://localhost:8000/
 MUSIC_DIRECTORY_PATH=/workspace/funkwhale/data/music
 STATIC_ROOT=/workspace/funkwhale/data/staticfiles/
diff --git a/api/config/settings/common.py b/api/config/settings/common.py
index 9b05d82e5..a83112b4a 100644
--- a/api/config/settings/common.py
+++ b/api/config/settings/common.py
@@ -168,9 +168,7 @@ else:
 FUNKWHALE_PROTOCOL = FUNKWHALE_PROTOCOL.lower()
 FUNKWHALE_HOSTNAME = FUNKWHALE_HOSTNAME.lower()
 FUNKWHALE_URL = f"{FUNKWHALE_PROTOCOL}://{FUNKWHALE_HOSTNAME}"
-FUNKWHALE_SPA_HTML_ROOT = env(
-    "FUNKWHALE_SPA_HTML_ROOT", default=FUNKWHALE_URL + "/front/"
-)
+FUNKWHALE_SPA_HTML_ROOT = env("FUNKWHALE_SPA_HTML_ROOT", default=FUNKWHALE_URL)
 """
 URL or path to the Web Application files.
 Funkwhale needs access to it so that it can inject <meta> tags relevant