YunoHost-Apps/funkwhale_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/funkwhale_ynh.git synced 2024-09-03 18:36:24 +02:00
Code Issues Activity Actions 1

Merge pull request #227 from YunoHost-Apps/testing

Browse source 
Fix nginx to load css in admin site
This commit is contained in:
Thomas 2023-06-11 10:58:15 +02:00 committed by GitHub
commit 61eb30baed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Funkwhale is a community-driven project that lets you listen and share music and audio within a decentralized, open network. Funkwhale is a community-driven project that lets you listen and share music and audio within a decentralized, open network.
**Shipped version:** 1.3.0~ynh1 **Shipped version:** 1.3.0~ynh2
**Demo:** https://demo.funkwhale.audio **Demo:** https://demo.funkwhale.audio

2
README_fr.md
View file

@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
Funkwhale est un projet communautaire qui vous permet d'écouter et de partager de la musique et de l'audio au sein d'un réseau ouvert et décentralisé. Funkwhale est un projet communautaire qui vous permet d'écouter et de partager de la musique et de l'audio au sein d'un réseau ouvert et décentralisé.
**Version incluse :** 1.3.0~ynh1 **Version incluse :** 1.3.0~ynh2
**Démo :** https://demo.funkwhale.audio **Démo :** https://demo.funkwhale.audio

38
conf/nginx.conf
View file

@ -103,19 +103,19 @@ location /media/attachments/ {
more_set_headers "Access-Control-Allow-Origin: *"; more_set_headers "Access-Control-Allow-Origin: *";
} }
# This is an internal location that is used to serve # This is an internal location that is used to serve
# media (uploaded) files once correct permission / authentication # media (uploaded) files once correct permission / authentication
# has been checked on API side. # has been checked on API side.
# Comment the "NON-S3" commented lines and uncomment "S3" commented lines # Comment the "NON-S3" commented lines and uncomment "S3" commented lines
# if you're storing media files in a S3 bucket. # if you're storing media files in a S3 bucket.
#location ~ /_protected/media/(.+) { location ~ /_protected/media/(.+)/ {
# internal; internal;
# alias ${MEDIA_ROOT}/$1; # NON-S3 alias __DATA_DIR__/data/media/$1; # NON-S3
# # Needed to ensure DSub auth isn't forwarded to S3/Minio, see #932. # Needed to ensure DSub auth isn't forwarded to S3/Minio, see #932.
# proxy_set_header Authorization ""; # S3 # proxy_set_header Authorization ""; # S3
# proxy_pass $1; # S3 # proxy_pass $1; # S3
# more_set_headers "Access-Control-Allow-Origin: *"; more_set_headers "Access-Control-Allow-Origin: *";
#} }
location /_protected/music/ { location /_protected/music/ {
# this is an internal location that is used to serve # this is an internal location that is used to serve
@ -127,6 +127,18 @@ location /_protected/music/ {
more_set_headers "Access-Control-Allow-Origin: *"; more_set_headers "Access-Control-Allow-Origin: *";
} }
# Allow direct access to /staticfiles
location /staticfiles/ {
alias __DATA_DIR__/data/static/;
more_set_headers "Access-Control-Allow-Origin: *";
}
# Allow direct access to only specific subdirectories in /media
location /media/dynamic_preferences/ {
alias __DATA_DIR__/data/media/dynamic_preferences/;
more_set_headers "Access-Control-Allow-Origin: *";
}
location /manifest.json { location /manifest.json {
return 302 /api/v1/instance/spa-manifest.json; return 302 /api/v1/instance/spa-manifest.json;
} }

2
manifest.toml
View file

@ -5,7 +5,7 @@ name = "Funkwhale"
description.en = "Convivial and modern music server" description.en = "Convivial and modern music server"
description.fr = "Serveur de musique moderne et convivial" description.fr = "Serveur de musique moderne et convivial"
version = "1.3.0~ynh1" version = "1.3.0~ynh2"
maintainers = ["Thovi98"] maintainers = ["Thovi98"]