Merge branch 'pre-release/1.3.0' into develop
This commit is contained in:
commit
b0d6a0407a
1122 changed files with 76173 additions and 66002 deletions
|
|
@ -112,8 +112,15 @@ http {
|
|||
proxy_pass http://funkwhale-api;
|
||||
}
|
||||
|
||||
location /media/ {
|
||||
alias /protected/media/;
|
||||
# Allow direct access to only specific subdirectories in /media
|
||||
location /media/__sized__/ {
|
||||
alias /protected/media/__sized__/;
|
||||
add_header Access-Control-Allow-Origin '*';
|
||||
}
|
||||
|
||||
# Allow direct access to only specific subdirectories in /media
|
||||
location /media/attachments/ {
|
||||
alias /protected/media/attachments/;
|
||||
add_header Access-Control-Allow-Origin '*';
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue