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

fix(deploy): Serve staticfiles in bare metal deployments 

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2665>
This commit is contained in:
Georg Krause 2023-12-04 15:56:12 +00:00 committed by Kasper Seweryn
parent 259fb1b61d
commit 3ee6ba6658
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Fix regression that prevent static files from being served in non-docker-deployments (#2256)

3
deploy/nginx.template
View File

@ -192,4 +192,7 @@ server {
return 302 ${FUNKWHALE_PROTOCOL}://${FUNKWHALE_HOSTNAME}/api/v1/instance/spa-manifest.json; return 302 ${FUNKWHALE_PROTOCOL}://${FUNKWHALE_HOSTNAME}/api/v1/instance/spa-manifest.json;
} }
location /staticfiles/ {
alias ${STATIC_ROOT}/;
}
} }

5
templates/nginx.conf.j2
View File

@ -261,5 +261,10 @@ server {
alias /usr/share/nginx/html/staticfiles/; alias /usr/share/nginx/html/staticfiles/;
} }
{% endif %} {% endif %}
{% if not config.reverse_proxy and not config.inside_docker %}
location /staticfiles/ {
alias ${STATIC_ROOT}/;
}
{% endif %}
{% endif %} {% endif %}
} }