MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove all /front/ occurences 

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2039>
This commit is contained in:
Georg Krause 2022-12-02 14:04:42 +00:00 committed by Marge
parent 620bb28f8e
commit ca9e3c7054
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.dev
View File

@ -10,7 +10,7 @@ MUSIC_DIRECTORY_PATH=/music
BROWSABLE_API_ENABLED=True BROWSABLE_API_ENABLED=True
FORWARDED_PROTO=http FORWARDED_PROTO=http
LDAP_ENABLED=False LDAP_ENABLED=False
FUNKWHALE_SPA_HTML_ROOT=http://nginx/front/ FUNKWHALE_SPA_HTML_ROOT=http://nginx/
PYTHONTRACEMALLOC=0 PYTHONTRACEMALLOC=0
# Uncomment this if you're using traefik/https # Uncomment this if you're using traefik/https

2
.gitpod/gitpod.env
View File

@ -5,7 +5,7 @@ C_FORCE_ROOT=true
BROWSABLE_API_ENABLED=True BROWSABLE_API_ENABLED=True
FORWARDED_PROTO=http FORWARDED_PROTO=http
LDAP_ENABLED=False LDAP_ENABLED=False
FUNKWHALE_SPA_HTML_ROOT=http://localhost:8000/front/ FUNKWHALE_SPA_HTML_ROOT=http://localhost:8000/
FUNKWHALE_URL=http://localhost:8000/ FUNKWHALE_URL=http://localhost:8000/
MUSIC_DIRECTORY_PATH=/workspace/funkwhale/data/music MUSIC_DIRECTORY_PATH=/workspace/funkwhale/data/music
STATIC_ROOT=/workspace/funkwhale/data/staticfiles/ STATIC_ROOT=/workspace/funkwhale/data/staticfiles/

4
api/config/settings/common.py
View File

@ -168,9 +168,7 @@ else:
FUNKWHALE_PROTOCOL = FUNKWHALE_PROTOCOL.lower() FUNKWHALE_PROTOCOL = FUNKWHALE_PROTOCOL.lower()
FUNKWHALE_HOSTNAME = FUNKWHALE_HOSTNAME.lower() FUNKWHALE_HOSTNAME = FUNKWHALE_HOSTNAME.lower()
FUNKWHALE_URL = f"{FUNKWHALE_PROTOCOL}://{FUNKWHALE_HOSTNAME}" FUNKWHALE_URL = f"{FUNKWHALE_PROTOCOL}://{FUNKWHALE_HOSTNAME}"
FUNKWHALE_SPA_HTML_ROOT = env( FUNKWHALE_SPA_HTML_ROOT = env("FUNKWHALE_SPA_HTML_ROOT", default=FUNKWHALE_URL)
"FUNKWHALE_SPA_HTML_ROOT", default=FUNKWHALE_URL + "/front/"
)
""" """
URL or path to the Web Application files. URL or path to the Web Application files.
Funkwhale needs access to it so that it can inject <meta> tags relevant Funkwhale needs access to it so that it can inject <meta> tags relevant