novaburst/funquail
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Georg Krause 2023-06-28 13:05:47 +02:00
commit 232ca0f050
30 changed files with 623 additions and 513 deletions
Download patch file Download diff file Expand all files Collapse all files

9
docker/nginx/conf.dev
View file

@ -132,6 +132,12 @@ http {
add_header Access-Control-Allow-Origin '*';
}
# Allow direct access to only specific subdirectories in /media
location /media/dynamic_preferences/ {
alias ${MEDIA_ROOT}/dynamic_preferences/;
add_header Access-Control-Allow-Origin '*';
}
# This is an internal location that is used to serve
# media (uploaded) files once correct permission / authentication
# has been checked on API side.
@ -157,7 +163,8 @@ http {
}
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;
}
location /staticfiles/ {