diff --git a/README.md b/README.md index 9f456d5..e83e58e 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,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. -**Shipped version:** 1.1.4~ynh2 +**Shipped version:** 1.2.0~ynh1 **Demo:** https://demo.funkwhale.audio diff --git a/README_fr.md b/README_fr.md index ef076b5..6757543 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour 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.1.4~ynh2 +**Version incluse :** 1.2.0~ynh1 **Démo :** https://demo.funkwhale.audio diff --git a/conf/api.src b/conf/api.src index e5c102a..26942be 100644 --- a/conf/api.src +++ b/conf/api.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/1.1.4/download?job=build_api -SOURCE_SUM=c3ea7013ffcbeb4e2832cc596cdccb2e2034b4250a25130aa4dc0d648fe03463 +SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/81307/artifacts/download +SOURCE_SUM=e1802f7798a51c7937c55a085e3470130f435c0307b5ad466b2233313ab935ac SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=api_master.zip +SOURCE_FILENAME=api_stable.zip SOURCE_EXTRACT=true diff --git a/conf/front.src b/conf/front.src index 6d3c19f..e79335a 100644 --- a/conf/front.src +++ b/conf/front.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/1.1.4/download?job=build_front -SOURCE_SUM=83e11273159dd617d16483168300768583b14ffb93cbceec5c4dccdfe2d3fb44 +SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/81303/artifacts/download +SOURCE_SUM=700d4967c2d512dccf6c0cff0ca392f2582429faabb76c24563b9490a3f15714 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=front_master.zip +SOURCE_FILENAME=front_stable.zip SOURCE_EXTRACT=true diff --git a/conf/nginx.conf b/conf/nginx.conf index c3161d5..0b1cdf6 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -105,12 +105,12 @@ location /media/ { alias __DATADIR__/media/; } -location /_protected/media { +location /_protected/media/ { # this is an internal location that is used to serve # audio files once correct permission / authentication # has been checked on API side internal; - alias __DATADIR__/media; + alias __DATADIR__/media/; } # Comment the previous location and uncomment this one if you're storing @@ -122,13 +122,13 @@ location /_protected/media { # proxy_pass $1; # } -location /_protected/music { +location /_protected/music/ { # this is an internal location that is used to serve # audio files once correct permission / authentication # has been checked on API side # Set this to the same value as your MUSIC_DIRECTORY_PATH setting internal; - alias __DATADIR__/music; + alias __DATADIR__/music/; } location /staticfiles/ { diff --git a/manifest.json b/manifest.json index a6fe0c3..fae2f6d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern, convivial and free music server", "fr": "Serveur de musique moderne, convivial et gratuit" }, - "version": "1.1.4~ynh2", + "version": "1.2.0~ynh1", "url": "https://funkwhale.audio", "upstream": { "license": "AGPL-3.0-or-later", diff --git a/scripts/install b/scripts/install index 11bf5e2..48680a7 100644 --- a/scripts/install +++ b/scripts/install @@ -123,9 +123,6 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Creating a data directory..." - -ynh_app_setting_set --app=$app --key=datadir --value=$datadir - mkdir -p $datadir mkdir -p $datadir/{static,media,music}