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

fix: Make sure the SPA Manifest is fetched using the right protocol 

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2468>
This commit is contained in:
Georg Krause 2023-06-12 15:02:25 +02:00 committed by Marge
parent da2d3ee7f1
commit 8698f2d17c
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/changelog.d/2151.bugfix Normal file
View File

@ -0,0 +1 @@
Make sure the SPA Manifest is fetched using the right protocol (#2151)

3
deploy/nginx.template
View File

@ -163,6 +163,7 @@ server {
} }
location /manifest.json { location /manifest.json {
return 302 /api/v1/instance/spa-manifest.json; # If the reverse proxy is terminating SSL, nginx gets confused and redirects to http, hence the full URL
return 302 ${FUNKWHALE_PROTOCOL}://${FUNKWHALE_HOSTNAME}/api/v1/instance/spa-manifest.json;
} }
} }

3
docker/nginx/conf.dev
View File

@ -163,7 +163,8 @@ http {
} }
location /manifest.json { location /manifest.json {
return 302 /api/v1/instance/spa-manifest.json; # If the reverse proxy is terminating SSL, nginx gets confused and redirects to http, hence the full URL
return 302 ${FUNKWHALE_PROTOCOL}://${FUNKWHALE_HOSTNAME}/api/v1/instance/spa-manifest.json;
} }
} }
} }

3
front/docker/funkwhale.conf.template
View File

@ -128,6 +128,7 @@ server {
} }
location /manifest.json { location /manifest.json {
return 302 /api/v1/instance/spa-manifest.json; # If the reverse proxy is terminating SSL, nginx gets confused and redirects to http, hence the full URL
return 302 ${FUNKWHALE_PROTOCOL}://${FUNKWHALE_HOSTNAME}/api/v1/instance/spa-manifest.json;
} }
} }