From 9b0f5fae84574079f414ea91f798ab8013b2868b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Oct 2020 07:51:38 +0200 Subject: [PATCH 01/31] Upgrade to 0.36.0 --- README.md | 2 +- README_fr.md | 2 +- conf/arm64.src | 4 ++-- conf/armv5.src | 4 ++-- conf/armv6.src | 4 ++-- conf/armv7.src | 4 ++-- conf/i386.src | 4 ++-- conf/x86-64.src | 4 ++-- manifest.json | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 4ae0506..2567589 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Navidrome is an open source web-based music collection server and streamer. It gives you freedom to listen to your music collection from any browser or mobile device. -**Shipped version:** 0.35.1 +**Shipped version:** 0.36.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index cdff34a..58ba4d8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Navidrome est un serveur et un streamer de collection de musique en ligne open source. Il vous donne la liberté d'écouter votre playlist à partir de n'importe quel navigateur ou appareil mobile. -**Version incluse :** 0.35.1 +**Version incluse :** 0.36.0 ## Captures d'écran diff --git a/conf/arm64.src b/conf/arm64.src index 229e1c9..c4a6281 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.35.1/navidrome_0.35.1_Linux_arm64.tar.gz -SOURCE_SUM=6f6c782ca6cd79b8d2acc4ccdc92cc978aa280486cda1639ad3034622e0e5fda +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.0/navidrome_0.36.0_Linux_arm64.tar.gz +SOURCE_SUM=d79f37bf0284e29f83a2c2813df1520c6e8f1e5f20c95a1390f0704cf71a8f1b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv5.src b/conf/armv5.src index 61a763b..9c9f153 100644 --- a/conf/armv5.src +++ b/conf/armv5.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.35.1/navidrome_0.35.1_Linux_armv5.tar.gz -SOURCE_SUM=f62bac3b02bf4458c36745507b52bcf3cca4ca06f7ab6ccf90d9be00016292a9 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.0/navidrome_0.36.0_Linux_armv5.tar.gz +SOURCE_SUM=83ccf015c4e119857d720ee939467faa662e62636c60474d77b267fcb9396d0c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv6.src b/conf/armv6.src index ce45465..01aabcb 100644 --- a/conf/armv6.src +++ b/conf/armv6.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.35.1/navidrome_0.35.1_Linux_armv6.tar.gz -SOURCE_SUM=27625ce2acbd250043077af36efa2f41bf993ff4efefe27dc51d488436bddc91 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.0/navidrome_0.36.0_Linux_armv6.tar.gz +SOURCE_SUM=67979af89363ffe998bba424fd648aa44c38a8351475551bc4b610ad45490fd3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv7.src b/conf/armv7.src index b0574e4..2356a86 100644 --- a/conf/armv7.src +++ b/conf/armv7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.35.1/navidrome_0.35.1_Linux_armv7.tar.gz -SOURCE_SUM=55343952e2c93d20f9eea0ec4135d0b99db6e5a9a63c2665efb5694e76df05a5 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.0/navidrome_0.36.0_Linux_armv7.tar.gz +SOURCE_SUM=cde6f1b77a1132697dc0ec835771fed16d294f8aed5499d5651cf2f920ddbd4d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/i386.src b/conf/i386.src index f0c8248..15e30a4 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.35.1/navidrome_0.35.1_Linux_i386.tar.gz -SOURCE_SUM=53ea638fb0ac3962c443440473ff69b5107568685d0bd7b28adb857a5edb02c5 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.0/navidrome_0.36.0_Linux_i386.tar.gz +SOURCE_SUM=cf5edf385d6e575fa75c7e9ff667cb1afd2b6271c56608387b600357bd0ada4e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/x86-64.src b/conf/x86-64.src index ec7a8f4..9662ed9 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.35.1/navidrome_0.35.1_Linux_x86_64.tar.gz -SOURCE_SUM=a7af80c0d3884de7fac5df4951da1d6bdcddba902e9d2ceb8197f677493cc61b +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.0/navidrome_0.36.0_Linux_x86_64.tar.gz +SOURCE_SUM=ea2831925fbb7124005b2abc72ee072e010e3c4f7b0e02f98184a7b906bb715c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index e0c0f1d..2835439 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern Music Server and Streamer compatible with Subsonic/Airsonic", "fr": "Serveur de musique moderne et Streamer compatibles avec Subsonic/Airsonic" }, - "version": "0.35.1~ynh1", + "version": "0.36.0~ynh1", "url": "https://github.com/deluan/navidrome/", "license": "GPL-3.0-only", "maintainer": { From 0e34cf47608efb2a4a3c0bad60f457cb048648b2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Oct 2020 09:13:02 +0200 Subject: [PATCH 02/31] Upgrade to 0.36.1 --- README.md | 3 ++- README_fr.md | 3 ++- conf/arm64.src | 4 ++-- conf/armv5.src | 4 ++-- conf/armv6.src | 4 ++-- conf/armv7.src | 4 ++-- conf/i386.src | 4 ++-- conf/x86-64.src | 4 ++-- manifest.json | 2 +- scripts/remove | 2 +- 10 files changed, 18 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 2567589..3213ec5 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Navidrome is an open source web-based music collection server and streamer. It gives you freedom to listen to your music collection from any browser or mobile device. -**Shipped version:** 0.36.0 +**Shipped version:** 0.36.1 ## Screenshots @@ -53,6 +53,7 @@ You must activate *public site* if you want to connect a client player to Navidr ## Links * Report a bug: https://github.com/YunoHost-Apps/navidrome_ynh/issues + * App website: https://www.navidrome.org/ * Upstream app repository: https://github.com/deluan/navidrome/ * YunoHost website: https://yunohost.org/ diff --git a/README_fr.md b/README_fr.md index 58ba4d8..b508437 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Navidrome est un serveur et un streamer de collection de musique en ligne open source. Il vous donne la liberté d'écouter votre playlist à partir de n'importe quel navigateur ou appareil mobile. -**Version incluse :** 0.36.0 +**Version incluse :** 0.36.1 ## Captures d'écran @@ -53,6 +53,7 @@ Vous devez activer *site public* si vous souhaitez connecter un lecteur client ## Liens * Signaler un bug : https://github.com/YunoHost-Apps/navidrome_ynh/issues + * Site de l'application : https://www.navidrome.org/ * Dépôt de l'application principale : https://github.com/deluan/navidrome/ * Site web YunoHost : https://yunohost.org/ diff --git a/conf/arm64.src b/conf/arm64.src index c4a6281..8269bf0 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.0/navidrome_0.36.0_Linux_arm64.tar.gz -SOURCE_SUM=d79f37bf0284e29f83a2c2813df1520c6e8f1e5f20c95a1390f0704cf71a8f1b +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.1/navidrome_0.36.1_Linux_arm64.tar.gz +SOURCE_SUM=b52f2c6028877aeaaa1d33596eb21fbc0e97bc9a06b60a26095dd583100933e3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv5.src b/conf/armv5.src index 9c9f153..cb9561c 100644 --- a/conf/armv5.src +++ b/conf/armv5.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.0/navidrome_0.36.0_Linux_armv5.tar.gz -SOURCE_SUM=83ccf015c4e119857d720ee939467faa662e62636c60474d77b267fcb9396d0c +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.1/navidrome_0.36.1_Linux_armv5.tar.gz +SOURCE_SUM=5399a40da6876cdf75e812369c07c091a97c9479fcc25661cc4af4eb73d145e0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv6.src b/conf/armv6.src index 01aabcb..9507a07 100644 --- a/conf/armv6.src +++ b/conf/armv6.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.0/navidrome_0.36.0_Linux_armv6.tar.gz -SOURCE_SUM=67979af89363ffe998bba424fd648aa44c38a8351475551bc4b610ad45490fd3 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.1/navidrome_0.36.1_Linux_armv6.tar.gz +SOURCE_SUM=bd88f4aeb1f35b53fd95135ef72841bd19c0ee43fe266ec69cae3a5fee8f68a1 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv7.src b/conf/armv7.src index 2356a86..61bae50 100644 --- a/conf/armv7.src +++ b/conf/armv7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.0/navidrome_0.36.0_Linux_armv7.tar.gz -SOURCE_SUM=cde6f1b77a1132697dc0ec835771fed16d294f8aed5499d5651cf2f920ddbd4d +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.1/navidrome_0.36.1_Linux_armv7.tar.gz +SOURCE_SUM=bf5c752a56c0ea0e1949989f62a13e7583da27434c391c955ff9a5927bb27a15 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/i386.src b/conf/i386.src index 15e30a4..83e1ca5 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.0/navidrome_0.36.0_Linux_i386.tar.gz -SOURCE_SUM=cf5edf385d6e575fa75c7e9ff667cb1afd2b6271c56608387b600357bd0ada4e +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.1/navidrome_0.36.1_Linux_i386.tar.gz +SOURCE_SUM=48749b2ff99c4f2267791344c92c030f418a72408f5987e5c1cc6220a0b9ff69 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/x86-64.src b/conf/x86-64.src index 9662ed9..a46e09f 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.0/navidrome_0.36.0_Linux_x86_64.tar.gz -SOURCE_SUM=ea2831925fbb7124005b2abc72ee072e010e3c4f7b0e02f98184a7b906bb715c +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.1/navidrome_0.36.1_Linux_x86_64.tar.gz +SOURCE_SUM=d60981e5a8a7863b88d42baa0ae03c860fa47c72a725c52552202bbaf69a6218 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 2835439..7b6f1be 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern Music Server and Streamer compatible with Subsonic/Airsonic", "fr": "Serveur de musique moderne et Streamer compatibles avec Subsonic/Airsonic" }, - "version": "0.36.0~ynh1", + "version": "0.36.1~ynh1", "url": "https://github.com/deluan/navidrome/", "license": "GPL-3.0-only", "maintainer": { diff --git a/scripts/remove b/scripts/remove index 4ab94ad..ba538dc 100644 --- a/scripts/remove +++ b/scripts/remove @@ -70,7 +70,7 @@ ynh_secure_remove --file="/var/lib/$app" #================================================= ynh_script_progression --message="Removing NGINX web server configuration..." --weight=5 -# Remove the dedicated nginx config +# Remove the dedicated NGINX config ynh_remove_nginx_config #================================================= From 2a97d9d5d556f911824db76a18a18de97c0e1b1a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 3 Nov 2020 15:09:22 +0100 Subject: [PATCH 03/31] Upgrade to v.0.37.0 --- README.md | 2 +- README_fr.md | 2 +- conf/arm64.src | 4 ++-- conf/armv5.src | 4 ++-- conf/armv6.src | 4 ++-- conf/armv7.src | 4 ++-- conf/i386.src | 4 ++-- conf/x86-64.src | 4 ++-- manifest.json | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 3213ec5..d6ef05c 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Navidrome is an open source web-based music collection server and streamer. It gives you freedom to listen to your music collection from any browser or mobile device. -**Shipped version:** 0.36.1 +**Shipped version:** 0.37.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index b508437..c584a69 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Navidrome est un serveur et un streamer de collection de musique en ligne open source. Il vous donne la liberté d'écouter votre playlist à partir de n'importe quel navigateur ou appareil mobile. -**Version incluse :** 0.36.1 +**Version incluse :** 0.37.0 ## Captures d'écran diff --git a/conf/arm64.src b/conf/arm64.src index 8269bf0..cf63007 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.1/navidrome_0.36.1_Linux_arm64.tar.gz -SOURCE_SUM=b52f2c6028877aeaaa1d33596eb21fbc0e97bc9a06b60a26095dd583100933e3 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.37.0/navidrome_0.37.0_Linux_arm64.tar.gz +SOURCE_SUM=ef387572cf88ac9faf0009cae615aba7ed851cf44510c8b9e1043b25b1aedb5a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv5.src b/conf/armv5.src index cb9561c..4647640 100644 --- a/conf/armv5.src +++ b/conf/armv5.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.1/navidrome_0.36.1_Linux_armv5.tar.gz -SOURCE_SUM=5399a40da6876cdf75e812369c07c091a97c9479fcc25661cc4af4eb73d145e0 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.37.0/navidrome_0.37.0_Linux_armv5.tar.gz +SOURCE_SUM=384f92d97a2dc467f65616ce5dcf3ca90eaad6f8a6568c88bdf417629488532e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv6.src b/conf/armv6.src index 9507a07..397ad30 100644 --- a/conf/armv6.src +++ b/conf/armv6.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.1/navidrome_0.36.1_Linux_armv6.tar.gz -SOURCE_SUM=bd88f4aeb1f35b53fd95135ef72841bd19c0ee43fe266ec69cae3a5fee8f68a1 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.37.0/navidrome_0.37.0_Linux_armv6.tar.gz +SOURCE_SUM=cfab5bfd9e92c312e848e8c629c6f06da23a180df1485e10a17656a334574c82 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv7.src b/conf/armv7.src index 61bae50..0bd7ac7 100644 --- a/conf/armv7.src +++ b/conf/armv7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.1/navidrome_0.36.1_Linux_armv7.tar.gz -SOURCE_SUM=bf5c752a56c0ea0e1949989f62a13e7583da27434c391c955ff9a5927bb27a15 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.37.0/navidrome_0.37.0_Linux_armv7.tar.gz +SOURCE_SUM=34b88ae16b611d36bf2a9b33072775058ecf9d46efac7042ead84bcfbc37d833 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/i386.src b/conf/i386.src index 83e1ca5..83989a2 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.1/navidrome_0.36.1_Linux_i386.tar.gz -SOURCE_SUM=48749b2ff99c4f2267791344c92c030f418a72408f5987e5c1cc6220a0b9ff69 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.37.0/navidrome_0.37.0_Linux_i386.tar.gz +SOURCE_SUM=82aee61d492695390d08df222d1d389ef0f6581ba0db70ea1448fe43062db7f3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/x86-64.src b/conf/x86-64.src index a46e09f..08b8abc 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.36.1/navidrome_0.36.1_Linux_x86_64.tar.gz -SOURCE_SUM=d60981e5a8a7863b88d42baa0ae03c860fa47c72a725c52552202bbaf69a6218 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.37.0/navidrome_0.37.0_Linux_x86_64.tar.gz +SOURCE_SUM=03b91287bc93187ec78b0b12ca041dd81890e05cfa90bcda0fcc2fbf554461dc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 7b6f1be..35c058f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern Music Server and Streamer compatible with Subsonic/Airsonic", "fr": "Serveur de musique moderne et Streamer compatibles avec Subsonic/Airsonic" }, - "version": "0.36.1~ynh1", + "version": "0.37.0~ynh1", "url": "https://github.com/deluan/navidrome/", "license": "GPL-3.0-only", "maintainer": { From 6b3bf2a938b24c25410bbe0edc38ec852cf4b63c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 3 Nov 2020 15:17:29 +0100 Subject: [PATCH 04/31] Update i386.src --- conf/i386.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/i386.src b/conf/i386.src index 83989a2..2bc0ea1 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,5 +1,5 @@ SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.37.0/navidrome_0.37.0_Linux_i386.tar.gz -SOURCE_SUM=82aee61d492695390d08df222d1d389ef0f6581ba0db70ea1448fe43062db7f3 +SOURCE_SUM=870f272f37edbfe4f508691e422887aca578820f8ca129e8b808e46508694c30 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false From 4d2e94dc56c03b55339f5b626416aaa912a50247 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 Nov 2020 08:24:57 +0100 Subject: [PATCH 06/31] Upgrade to 0.38.0 --- README.md | 2 +- README_fr.md | 2 +- conf/arm64.src | 4 ++-- conf/armv5.src | 4 ++-- conf/armv6.src | 4 ++-- conf/armv7.src | 4 ++-- conf/i386.src | 4 ++-- conf/navidrome.toml | 18 ++++++++++++++++++ conf/x86-64.src | 4 ++-- manifest.json | 2 +- 10 files changed, 33 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index d6ef05c..42902ab 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Navidrome is an open source web-based music collection server and streamer. It gives you freedom to listen to your music collection from any browser or mobile device. -**Shipped version:** 0.37.0 +**Shipped version:** 0.38.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index c584a69..e1fb741 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Navidrome est un serveur et un streamer de collection de musique en ligne open source. Il vous donne la liberté d'écouter votre playlist à partir de n'importe quel navigateur ou appareil mobile. -**Version incluse :** 0.37.0 +**Version incluse :** 0.38.0 ## Captures d'écran diff --git a/conf/arm64.src b/conf/arm64.src index cf63007..0896ca9 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.37.0/navidrome_0.37.0_Linux_arm64.tar.gz -SOURCE_SUM=ef387572cf88ac9faf0009cae615aba7ed851cf44510c8b9e1043b25b1aedb5a +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.38.0/navidrome_0.38.0_Linux_arm64.tar.gz +SOURCE_SUM=2072eed1b538ec31549d11cdbd6fb29f2d5a39dde381d7da14a27f9a4f3afa14 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv5.src b/conf/armv5.src index 4647640..c5fb82e 100644 --- a/conf/armv5.src +++ b/conf/armv5.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.37.0/navidrome_0.37.0_Linux_armv5.tar.gz -SOURCE_SUM=384f92d97a2dc467f65616ce5dcf3ca90eaad6f8a6568c88bdf417629488532e +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.38.0/navidrome_0.38.0_Linux_armv5.tar.gz +SOURCE_SUM=18c3d39f02a7ed4a90b1cb871147bd13483f9f5b243b45ed8d5a215f3f46088f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv6.src b/conf/armv6.src index 397ad30..cbb3bac 100644 --- a/conf/armv6.src +++ b/conf/armv6.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.37.0/navidrome_0.37.0_Linux_armv6.tar.gz -SOURCE_SUM=cfab5bfd9e92c312e848e8c629c6f06da23a180df1485e10a17656a334574c82 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.38.0/navidrome_0.38.0_Linux_armv6.tar.gz +SOURCE_SUM=04c44a982fb96481e222db1254bf8318521b4bcd12d020fb397336d5d38b59b7 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv7.src b/conf/armv7.src index 0bd7ac7..4a2643d 100644 --- a/conf/armv7.src +++ b/conf/armv7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.37.0/navidrome_0.37.0_Linux_armv7.tar.gz -SOURCE_SUM=34b88ae16b611d36bf2a9b33072775058ecf9d46efac7042ead84bcfbc37d833 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.38.0/navidrome_0.38.0_Linux_armv7.tar.gz +SOURCE_SUM=3507e7f3215ab36ce0a949effeb12bbf49cb075491f614e7451f5af4806aedff SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/i386.src b/conf/i386.src index 2bc0ea1..6dc8e19 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.37.0/navidrome_0.37.0_Linux_i386.tar.gz -SOURCE_SUM=870f272f37edbfe4f508691e422887aca578820f8ca129e8b808e46508694c30 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.38.0/navidrome_0.38.0_Linux_i386.tar.gz +SOURCE_SUM=cabd4691294ff63277614741348bb20018e147dd895cdb91f64627272127e23b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/navidrome.toml b/conf/navidrome.toml index 2fb93e1..eead18a 100644 --- a/conf/navidrome.toml +++ b/conf/navidrome.toml @@ -42,3 +42,21 @@ AutoImportPlaylists = "true" # The default metadata extractor is still ffmpeg but you can use the new taglib extractor Scanner.Extractor = "taglib" + +# Last.FM ApiKey +LastFM.ApiKey = "" + +# Last.FM Shared Secret +LastFM.Secret = "" + +# Two letter-code for language to be used to retrieve biographies from Last.FM +LastFM.Language = "en" + +# Spotify Client ID +Spotify.ID = "" + +# Spotify Client Secret +Spotify.Secret = "" + +# Use Gravatar images as the user profile image. Needs the user’s email to be filled +EnableGravatar = "false" diff --git a/conf/x86-64.src b/conf/x86-64.src index 08b8abc..7d20747 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.37.0/navidrome_0.37.0_Linux_x86_64.tar.gz -SOURCE_SUM=03b91287bc93187ec78b0b12ca041dd81890e05cfa90bcda0fcc2fbf554461dc +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.38.0/navidrome_0.38.0_Linux_x86_64.tar.gz +SOURCE_SUM=8827127a7e0e2db58acca1a7499f2b3c8576f80e8076fa501d6485dfb6fed305 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 35c058f..58f8e5e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern Music Server and Streamer compatible with Subsonic/Airsonic", "fr": "Serveur de musique moderne et Streamer compatibles avec Subsonic/Airsonic" }, - "version": "0.37.0~ynh1", + "version": "0.38.0~ynh1", "url": "https://github.com/deluan/navidrome/", "license": "GPL-3.0-only", "maintainer": { From e987a18fc0fb63210b816afa5e1f3faab0cbd7d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 2 Dec 2020 08:27:32 +0100 Subject: [PATCH 07/31] upgrade to 0.39.0 (#38) * upgrade to 0.39.0 * Fix linter warnings --- README.md | 2 +- README_fr.md | 2 +- check_process | 2 -- conf/arm64.src | 4 ++-- conf/armv5.src | 4 ++-- conf/armv6.src | 4 ++-- conf/armv7.src | 4 ++-- conf/i386.src | 4 ++-- conf/x86-64.src | 4 ++-- manifest.json | 2 +- scripts/_common.sh | 2 +- scripts/restore | 2 +- 12 files changed, 17 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 42902ab..cad66ee 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Navidrome is an open source web-based music collection server and streamer. It gives you freedom to listen to your music collection from any browser or mobile device. -**Shipped version:** 0.38.0 +**Shipped version:** 0.39.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index e1fb741..8a97727 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Navidrome est un serveur et un streamer de collection de musique en ligne open source. Il vous donne la liberté d'écouter votre playlist à partir de n'importe quel navigateur ou appareil mobile. -**Version incluse :** 0.38.0 +**Version incluse :** 0.39.0 ## Captures d'écran diff --git a/check_process b/check_process index 7211c17..ba46a26 100644 --- a/check_process +++ b/check_process @@ -16,8 +16,6 @@ multi_instance=0 port_already_use=1 change_url=1 -;;; Levels - Level 5=auto ;;; Options Email= Notification=none \ No newline at end of file diff --git a/conf/arm64.src b/conf/arm64.src index 0896ca9..893c2ac 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.38.0/navidrome_0.38.0_Linux_arm64.tar.gz -SOURCE_SUM=2072eed1b538ec31549d11cdbd6fb29f2d5a39dde381d7da14a27f9a4f3afa14 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.39.0/navidrome_0.39.0_Linux_arm64.tar.gz +SOURCE_SUM=f54ebe5401f92c856c24a6085192c01c6db4a07819ed680bc758765da56fe4c4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv5.src b/conf/armv5.src index c5fb82e..08d53bb 100644 --- a/conf/armv5.src +++ b/conf/armv5.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.38.0/navidrome_0.38.0_Linux_armv5.tar.gz -SOURCE_SUM=18c3d39f02a7ed4a90b1cb871147bd13483f9f5b243b45ed8d5a215f3f46088f +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.39.0/navidrome_0.39.0_Linux_armv5.tar.gz +SOURCE_SUM=ad705440b8d0fd27cda76e7865e74c5d79c4e1cdb24b43b47d189b6cce04e90d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv6.src b/conf/armv6.src index cbb3bac..146a2b2 100644 --- a/conf/armv6.src +++ b/conf/armv6.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.38.0/navidrome_0.38.0_Linux_armv6.tar.gz -SOURCE_SUM=04c44a982fb96481e222db1254bf8318521b4bcd12d020fb397336d5d38b59b7 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.39.0/navidrome_0.39.0_Linux_armv6.tar.gz +SOURCE_SUM=516f06fc69de2954b624a2ae39ce1ee2a8bf8ba253ccb6ca4c24234375e2189c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv7.src b/conf/armv7.src index 4a2643d..9485033 100644 --- a/conf/armv7.src +++ b/conf/armv7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.38.0/navidrome_0.38.0_Linux_armv7.tar.gz -SOURCE_SUM=3507e7f3215ab36ce0a949effeb12bbf49cb075491f614e7451f5af4806aedff +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.39.0/navidrome_0.39.0_Linux_armv7.tar.gz +SOURCE_SUM=a61d30e13889802b72e1d41c8a7aff7dede5c14d52b20bfab0c912fa1b4fe3e2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/i386.src b/conf/i386.src index 6dc8e19..80cae17 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.38.0/navidrome_0.38.0_Linux_i386.tar.gz -SOURCE_SUM=cabd4691294ff63277614741348bb20018e147dd895cdb91f64627272127e23b +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.39.0/navidrome_0.39.0_Linux_i386.tar.gz +SOURCE_SUM=4ff969fe002591258c952b1e9ae16e33a5c09e8e1d2ff721dc7fcbcc77e0a09b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/x86-64.src b/conf/x86-64.src index 7d20747..f35335a 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.38.0/navidrome_0.38.0_Linux_x86_64.tar.gz -SOURCE_SUM=8827127a7e0e2db58acca1a7499f2b3c8576f80e8076fa501d6485dfb6fed305 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.39.0/navidrome_0.39.0_Linux_x86_64.tar.gz +SOURCE_SUM=9639326166140e9899753fd31ca36e144b2d40bcdb582ded06b476d4d2a2f859 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 58f8e5e..df38e8d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern Music Server and Streamer compatible with Subsonic/Airsonic", "fr": "Serveur de musique moderne et Streamer compatibles avec Subsonic/Airsonic" }, - "version": "0.38.0~ynh1", + "version": "0.39.0~ynh1", "url": "https://github.com/deluan/navidrome/", "license": "GPL-3.0-only", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 3613e5c..2dd254a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -55,7 +55,7 @@ ynh_multimedia_build_main_dir () { local checksum="806a827ba1902d6911095602a9221181" # Download yunohost.multimedia scripts - wget -nv https://github.com/YunoHost-Apps/yunohost.multimedia/archive/${ynh_media_release}.tar.gz + wget -nv https://github.com/YunoHost-Apps/yunohost.multimedia/archive/${ynh_media_release}.tar.gz 2>&1 # Check the control sum echo "${checksum} ${ynh_media_release}.tar.gz" | md5sum -c --status \ diff --git a/scripts/restore b/scripts/restore index 6d34123..51ede62 100644 --- a/scripts/restore +++ b/scripts/restore @@ -96,7 +96,7 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Restoring the systemd configuration..." --weight=5 ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service +systemctl enable $app.service --quiet #================================================= # INTEGRATE SERVICE IN YUNOHOST From 5a86d1ca888771535b4322e4d49fbb15ba0bff44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 17 Dec 2020 21:13:37 +0100 Subject: [PATCH 08/31] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cad66ee..d25777f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Navidrome for YunoHost [![Integration level](https://dash.yunohost.org/integration/navidrome.svg)](https://dash.yunohost.org/appci/app/navidrome) ![](https://ci-apps.yunohost.org/ci/badges/navidrome.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/navidrome.maintain.svg) -[![Install Navidrome with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=navidrome) +[![Install Navidrome with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=navidrome) *[Lire ce readme en français.](./README_fr.md)* From 9c9a729da6fe8dce60f1c525c2285c49ce90d1f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 26 Dec 2020 09:29:43 +0100 Subject: [PATCH 09/31] use SVG badge --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index 8a97727..21b1bbb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Navidrome pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/navidrome.svg)](https://dash.yunohost.org/appci/app/navidrome) ![](https://ci-apps.yunohost.org/ci/badges/navidrome.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/navidrome.maintain.svg) -[![Installer Navidrome avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=navidrome) +[![Installer Navidrome avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=navidrome) *[Read this readme in english.](./README.md)* From 3b2f6ccf515bb3352a6309964aed3db21f97878d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 7 Jan 2021 11:19:19 +0100 Subject: [PATCH 10/31] Update navidrome.toml --- conf/navidrome.toml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/conf/navidrome.toml b/conf/navidrome.toml index eead18a..70f8e37 100644 --- a/conf/navidrome.toml +++ b/conf/navidrome.toml @@ -1,3 +1,6 @@ +# Load configurations from an external config file +ConfigFile = "/var/lib/navidrome/navidrome.toml" + # Log level. Useful for troubleshooting. Possible values: error, info, debug, trace LogLevel = "INFO" @@ -14,7 +17,10 @@ BaseURL = "__PATH_URL__" ScanInterval = "90s" # Size of transcoding cache. Set to 0 to disable cache -TranscodingCacheSize = "150MiB" +TranscodingCacheSize = "150MB" + +# Size of image (art work) cache. Set to 0 to disable cache +ImageCacheSize = "100MB" # Folder to store application data (DB, cache…) DataFolder = "__CONFIG_PATH__" @@ -22,6 +28,12 @@ DataFolder = "__CONFIG_PATH__" # Folder where your music library is stored. Can be read-only MusicFolder = "/home/yunohost.multimedia/share/Music" +#Change background image used in the Login page +UILoginBackgroundUrl = "" + +# Add a welcome message to the login screen +UIWelcomeMessage = "" + # How long Navidrome will wait before closing web ui idle sessions SessionTimeout = "24h" From 2a51d09498226eb93795946d99cc7f8f9216326c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 7 Jan 2021 11:20:39 +0100 Subject: [PATCH 11/31] Update issue_template.md --- issue_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/issue_template.md b/issue_template.md index 31e3730..6c4b9d3 100644 --- a/issue_template.md +++ b/issue_template.md @@ -20,7 +20,7 @@ about: Create a report to help us debug, it would be nice to fill the template a - Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* - YunoHost version: x.x.x - I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* -- Are you in a special context or did you perform some particular tweaking on your YunoHost instance ?: *no / yes* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* - If yes, please explain: - Using, or trying to install package version/branch: - If upgrading, current package version: *can be found in the admin, or with `yunohost app info navidrome`* From 4b815ab4ead5c45727572bcb63c66a8394175888 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 9 Jan 2021 22:40:52 +0100 Subject: [PATCH 12/31] Finding an available port --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 3bf61b2..f10411f 100644 --- a/scripts/install +++ b/scripts/install @@ -55,7 +55,7 @@ ynh_app_setting_set --app=$app --key=is_public --value=$is_public #================================================= # FIND AND OPEN A PORT #================================================= -ynh_script_progression --message="Configuring firewall..." --weight=0 +ynh_script_progression --message="Finding an available port..." --weight=0 # Find an available port port=$(ynh_find_port --port=4533) From 7287c2a8eaa806e63473681d5ef7eff61a4e5e23 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 20 Jan 2021 12:02:48 +0100 Subject: [PATCH 13/31] Fix linter --- manifest.json | 2 +- pull_request_template.md | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/manifest.json b/manifest.json index df38e8d..fd2f47d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern Music Server and Streamer compatible with Subsonic/Airsonic", "fr": "Serveur de musique moderne et Streamer compatibles avec Subsonic/Airsonic" }, - "version": "0.39.0~ynh1", + "version": "0.39.0~ynh2", "url": "https://github.com/deluan/navidrome/", "license": "GPL-3.0-only", "maintainer": { diff --git a/pull_request_template.md b/pull_request_template.md index 2d4bf40..69ce5a0 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -10,9 +10,3 @@ - [ ] Fix or enhancement tested. - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. - -## Package_check results ---- -*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* - -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/navidrome_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/navidrome_ynh%20PR-NUM-%20(USERNAME)/) From 080ca608d575db636be8b4659f88e76bc6ec234c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 7 Feb 2021 21:34:06 +0100 Subject: [PATCH 14/31] Upgrade to 040.0 (#42) * Upgrade to 040.0 * Fix --- README.md | 2 +- README_fr.md | 2 +- conf/arm64.src | 4 ++-- conf/armv5.src | 4 ++-- conf/armv6.src | 4 ++-- conf/armv7.src | 4 ++-- conf/i386.src | 4 ++-- conf/x86-64.src | 4 ++-- manifest.json | 2 +- pull_request_template.md | 4 ++++ scripts/change_url | 4 ++-- scripts/install | 6 +++--- scripts/restore | 2 +- scripts/upgrade | 14 +++++++++++++- 14 files changed, 38 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index d25777f..3885925 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Navidrome is an open source web-based music collection server and streamer. It gives you freedom to listen to your music collection from any browser or mobile device. -**Shipped version:** 0.39.0 +**Shipped version:** 0.40.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 21b1bbb..5becdc5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Navidrome est un serveur et un streamer de collection de musique en ligne open source. Il vous donne la liberté d'écouter votre playlist à partir de n'importe quel navigateur ou appareil mobile. -**Version incluse :** 0.39.0 +**Version incluse :** 0.40.0 ## Captures d'écran diff --git a/conf/arm64.src b/conf/arm64.src index 893c2ac..e6e4c31 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.39.0/navidrome_0.39.0_Linux_arm64.tar.gz -SOURCE_SUM=f54ebe5401f92c856c24a6085192c01c6db4a07819ed680bc758765da56fe4c4 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.40.0/navidrome_0.40.0_Linux_arm64.tar.gz +SOURCE_SUM=136505badfd5ffff5b54a1a6c4188625b63d9b72bcd35fe1612f0c669762e7c7 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv5.src b/conf/armv5.src index 08d53bb..27809b9 100644 --- a/conf/armv5.src +++ b/conf/armv5.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.39.0/navidrome_0.39.0_Linux_armv5.tar.gz -SOURCE_SUM=ad705440b8d0fd27cda76e7865e74c5d79c4e1cdb24b43b47d189b6cce04e90d +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.40.0/navidrome_0.40.0_Linux_armv5.tar.gz +SOURCE_SUM=b14ffc330eb9f93ca4abc75b1758ef88e62dd7fd878c917abe9c3c496d5737d6 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv6.src b/conf/armv6.src index 146a2b2..1ed3f05 100644 --- a/conf/armv6.src +++ b/conf/armv6.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.39.0/navidrome_0.39.0_Linux_armv6.tar.gz -SOURCE_SUM=516f06fc69de2954b624a2ae39ce1ee2a8bf8ba253ccb6ca4c24234375e2189c +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.40.0/navidrome_0.40.0_Linux_armv6.tar.gz +SOURCE_SUM=83ee2aeff3a52823aca91755c9aac92d8988e85c31203d9da869df3362c70b2f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv7.src b/conf/armv7.src index 9485033..d211aa6 100644 --- a/conf/armv7.src +++ b/conf/armv7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.39.0/navidrome_0.39.0_Linux_armv7.tar.gz -SOURCE_SUM=a61d30e13889802b72e1d41c8a7aff7dede5c14d52b20bfab0c912fa1b4fe3e2 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.40.0/navidrome_0.40.0_Linux_armv7.tar.gz +SOURCE_SUM=fbc8f319bea31fa8280f2a7275cb1f44a85baaab0623ced203d323acaaaa58c3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/i386.src b/conf/i386.src index 80cae17..03ff528 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.39.0/navidrome_0.39.0_Linux_i386.tar.gz -SOURCE_SUM=4ff969fe002591258c952b1e9ae16e33a5c09e8e1d2ff721dc7fcbcc77e0a09b +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.40.0/navidrome_0.40.0_Linux_i386.tar.gz +SOURCE_SUM=6f8389326e2699c4ec22fb7430d64bc301a4bceba98e09ecc8e19a378411ffaf SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/x86-64.src b/conf/x86-64.src index f35335a..a6b1a33 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.39.0/navidrome_0.39.0_Linux_x86_64.tar.gz -SOURCE_SUM=9639326166140e9899753fd31ca36e144b2d40bcdb582ded06b476d4d2a2f859 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.40.0/navidrome_0.40.0_Linux_x86_64.tar.gz +SOURCE_SUM=b01213087ca38b9e4e9e8a4d94308dca949ffe3f0b2ad6ab4863d8cf97d0672b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index fd2f47d..a05b2b7 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern Music Server and Streamer compatible with Subsonic/Airsonic", "fr": "Serveur de musique moderne et Streamer compatibles avec Subsonic/Airsonic" }, - "version": "0.39.0~ynh2", + "version": "0.40.0~ynh1", "url": "https://github.com/deluan/navidrome/", "license": "GPL-3.0-only", "maintainer": { diff --git a/pull_request_template.md b/pull_request_template.md index 69ce5a0..6c28fc5 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -10,3 +10,7 @@ - [ ] Fix or enhancement tested. - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. + +## Package_check results +--- +* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* diff --git a/scripts/change_url b/scripts/change_url index 1a815e9..69455b1 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -70,7 +70,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action=stop --log_path="/var/log/$app/$app.log" #================================================= # MODIFY URL IN NGINX CONF @@ -126,7 +126,7 @@ ynh_store_file_checksum --file="$config_path/navidrome.toml" ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Version:" +ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Version:" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index f10411f..a336505 100644 --- a/scripts/install +++ b/scripts/install @@ -153,17 +153,17 @@ yunohost service add $app --description "Web-based music collection server and s ynh_script_progression --message="Starting a systemd service..." --weight=2 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Version:" +ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Version:" #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." --weight=1 +ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary or protect it if [ $is_public -eq 1 ] then - ynh_permission_update --permission "main" --add "visitors" + ynh_permission_update --permission="main" --add="visitors" fi #================================================= diff --git a/scripts/restore b/scripts/restore index 51ede62..bdeed66 100644 --- a/scripts/restore +++ b/scripts/restore @@ -110,7 +110,7 @@ yunohost service add $app --description "Web-based music collection server and s #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Version:" +ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Version:" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index b2a525e..17ae65a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -30,6 +30,18 @@ ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) +#================================================= +# ENSURE DOWNWARD COMPATIBILITY +#================================================= +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 + +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -51,7 +63,7 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" +ynh_systemd_action --service_name=$app --action=stop --log_path=systemd #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE From 30ea6a10dd5b169c68b03d64714c38247b33160d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 7 Feb 2021 21:48:23 +0100 Subject: [PATCH 15/31] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 17ae65a..4f78b08 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -151,7 +151,7 @@ yunohost service add $app --description "Web-based music collection server and s #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Version:" +ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Version:" #================================================= # RELOAD NGINX From 8eb668f6dbc45bc1a8a0ceb8fbf63aff87f19fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 19 Feb 2021 23:24:30 +0100 Subject: [PATCH 16/31] Simplify config (#44) * Simplify config --- conf/systemd.service | 2 +- scripts/install | 10 +--------- scripts/upgrade | 5 ++--- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 3402c6e..fa73915 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -10,7 +10,7 @@ WantedBy=multi-user.target User=__APP__ Group=__APP__ Type=simple -ExecStart=__FINAL_PATH__/__APP__ --configfile "__CONFIG_PATH__/navidrome.toml" +ExecStart=__FINALPATH__/__APP__ --configfile "__CONFIG_PATH__/navidrome.toml" WorkingDirectory=__CONFIG_PATH__ TimeoutStopSec=20 KillMode=process diff --git a/scripts/install b/scripts/install index a336505..464257e 100644 --- a/scripts/install +++ b/scripts/install @@ -109,13 +109,8 @@ ynh_script_progression --message="Modifying a config file..." --weight=1 config_path="/var/lib/$app" mkdir -p "$config_path" -cp ../conf/navidrome.toml "$config_path/navidrome.toml" - # Main config File -ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_path/navidrome.toml" -ynh_replace_string --match_string="__PATH_URL__" --replace_string="$path_url" --target_file="$config_path/navidrome.toml" -ynh_replace_string --match_string="__CONFIG_PATH__" --replace_string="$config_path" --target_file="$config_path/navidrome.toml" - +ynh_add_config --template="../conf/navidrome.toml" --destination="$config_path/navidrome.toml" ynh_store_file_checksum --file="$config_path/navidrome.toml" #================================================= @@ -123,10 +118,7 @@ ynh_store_file_checksum --file="$config_path/navidrome.toml" #================================================= ynh_script_progression --message="Configuring a systemd service..." --weight=1 -ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="../conf/systemd.service" -ynh_replace_string --match_string="__FINAL_PATH__" --replace_string="$final_path" --target_file="../conf/systemd.service" ynh_replace_string --match_string="__CONFIG_PATH__" --replace_string="$config_path" --target_file="../conf/systemd.service" - ynh_add_systemd_config #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4f78b08..d5a7b8c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -121,11 +121,10 @@ ynh_script_progression --message="Configuring a systemd service..." --weight=2 config_path="/var/lib/$app" -ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="../conf/systemd.service" -ynh_replace_string --match_string="__FINAL_PATH__" --replace_string="$final_path" --target_file="../conf/systemd.service" -ynh_replace_string --match_string="__CONFIG_PATH__" --replace_string="$config_path" --target_file="../conf/systemd.service" +ynh_add_config --template="../conf/navidrome.toml" --destination="$config_path/navidrome.toml" # Create a dedicated systemd config +ynh_replace_string --match_string="__CONFIG_PATH__" --replace_string="$config_path" --target_file="../conf/systemd.service" ynh_add_systemd_config #================================================= From c7e6e9708ced4ac9659205a2c0d716e9d6abfb51 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 15 Mar 2021 09:17:20 +0100 Subject: [PATCH 17/31] Update manifest.json --- manifest.json | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/manifest.json b/manifest.json index a05b2b7..f96f1f6 100644 --- a/manifest.json +++ b/manifest.json @@ -13,7 +13,7 @@ "name": "eric_G" }, "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.1.7" }, "multi_instance": false, "services": [ @@ -24,29 +24,17 @@ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain name for Navidrome", - "fr": "Choisissez un nom de domaine pour Navidrome" - }, "example": "domain.org" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for Navidrome", - "fr": "Choisissez un chemin pour Navidrome" - }, "example": "/navidrome", "default": "/navidrome" }, { "name": "is_public", "type": "boolean", - "ask": { - "en": "Is it a public site?", - "fr": "Est-ce un site public ?" - }, "help": { "en": "You must activate public site if you want to connect a client player to Navidrome. This can be changed later via the webadmin.", "fr": "Vous devez activer site public si vous souhaitez connecter un lecteur client à Navidrome. Vous pourrez changer ceci plus tard via la webadmin." From c9197004e054f0852db36bac659d50b341ec9c81 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 15 Mar 2021 10:32:22 +0100 Subject: [PATCH 18/31] Cleaning up --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 2 +- scripts/install | 1 - scripts/upgrade | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3885925..10f7bf9 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ You must activate *public site* if you want to connect a client player to Navidr ## Documentation * Official documentation: https://www.navidrome.org/docs/ - * YunoHost documentation: https://yunohost.org/#/app_navidrome + * YunoHost documentation: https://yunohost.org/en/app_navidrome ## YunoHost specific features diff --git a/README_fr.md b/README_fr.md index 5becdc5..85aff2f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -36,7 +36,7 @@ Vous devez activer *site public* si vous souhaitez connecter un lecteur client ## Documentation * Documentation officielle : https://www.navidrome.org/docs/ - * Documentation YunoHost : https://yunohost.org/#/app_navidrome_fr + * Documentation YunoHost : https://yunohost.org/fr/app_navidrome ## Caractéristiques spécifiques YunoHost diff --git a/manifest.json b/manifest.json index f96f1f6..2507ffb 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern Music Server and Streamer compatible with Subsonic/Airsonic", "fr": "Serveur de musique moderne et Streamer compatibles avec Subsonic/Airsonic" }, - "version": "0.40.0~ynh1", + "version": "0.40.0~ynh2", "url": "https://github.com/deluan/navidrome/", "license": "GPL-3.0-only", "maintainer": { diff --git a/scripts/install b/scripts/install index 464257e..be3bedc 100644 --- a/scripts/install +++ b/scripts/install @@ -48,7 +48,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=2 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=is_public --value=$is_public #================================================= # STANDARD MODIFICATIONS diff --git a/scripts/upgrade b/scripts/upgrade index d5a7b8c..4bdf487 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,7 +18,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) -is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) architecture=$(ynh_detect_arch) From 681cd3a121005e4fa6e11696e19fe1696843c671 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 24 Mar 2021 07:51:38 +0100 Subject: [PATCH 19/31] Upgrade to version 0.41.0 --- README.md | 2 +- README_fr.md | 2 +- check_process | 8 ++++++-- conf/arm64.src | 4 ++-- conf/armv5.src | 4 ++-- conf/armv6.src | 4 ++-- conf/armv7.src | 4 ++-- conf/i386.src | 4 ++-- conf/x86-64.src | 4 ++-- manifest.json | 2 +- scripts/install | 10 ++++++---- scripts/restore | 6 ++++-- scripts/upgrade | 6 ++++-- 13 files changed, 35 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 10f7bf9..0b8335e 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Navidrome is an open source web-based music collection server and streamer. It gives you freedom to listen to your music collection from any browser or mobile device. -**Shipped version:** 0.40.0 +**Shipped version:** 0.41.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 85aff2f..afb2333 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Navidrome est un serveur et un streamer de collection de musique en ligne open source. Il vous donne la liberté d'écouter votre playlist à partir de n'importe quel navigateur ou appareil mobile. -**Version incluse :** 0.40.0 +**Version incluse :** 0.41.0 ## Captures d'écran diff --git a/check_process b/check_process index ba46a26..064029f 100644 --- a/check_process +++ b/check_process @@ -12,10 +12,14 @@ setup_private=1 setup_public=1 upgrade=1 + upgrade=1 from_commit=e41c919ddb65673ea6b452e138d36c240be3b6b7 backup_restore=1 multi_instance=0 - port_already_use=1 change_url=1 ;;; Options Email= -Notification=none \ No newline at end of file +Notification=none +;;; Upgrade options + ; commit=e41c919ddb65673ea6b452e138d36c240be3b6b7 + name=Testing (#43) + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& diff --git a/conf/arm64.src b/conf/arm64.src index e6e4c31..48e3f5f 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.40.0/navidrome_0.40.0_Linux_arm64.tar.gz -SOURCE_SUM=136505badfd5ffff5b54a1a6c4188625b63d9b72bcd35fe1612f0c669762e7c7 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.0/navidrome_0.41.0_Linux_arm64.tar.gz +SOURCE_SUM=8d7a3a236d842e38c41a672a9699cde0a86408d821c570dc4b2daa0684394a85 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv5.src b/conf/armv5.src index 27809b9..88376bc 100644 --- a/conf/armv5.src +++ b/conf/armv5.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.40.0/navidrome_0.40.0_Linux_armv5.tar.gz -SOURCE_SUM=b14ffc330eb9f93ca4abc75b1758ef88e62dd7fd878c917abe9c3c496d5737d6 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.0/navidrome_0.41.0_Linux_armv5.tar.gz +SOURCE_SUM=15d4017d10db7c85ae6dae006f36d329e58eebd38a663725c0f8b92f197c57d1 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv6.src b/conf/armv6.src index 1ed3f05..3a2cfed 100644 --- a/conf/armv6.src +++ b/conf/armv6.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.40.0/navidrome_0.40.0_Linux_armv6.tar.gz -SOURCE_SUM=83ee2aeff3a52823aca91755c9aac92d8988e85c31203d9da869df3362c70b2f +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.0/navidrome_0.41.0_Linux_armv6.tar.gz +SOURCE_SUM=8ef6998631e7684456898d3d46fba56d5e85c15ec390fdb06cf5c60ddb058e93 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv7.src b/conf/armv7.src index d211aa6..4cfe5ab 100644 --- a/conf/armv7.src +++ b/conf/armv7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.40.0/navidrome_0.40.0_Linux_armv7.tar.gz -SOURCE_SUM=fbc8f319bea31fa8280f2a7275cb1f44a85baaab0623ced203d323acaaaa58c3 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.0/navidrome_0.41.0_Linux_armv7.tar.gz +SOURCE_SUM=39e6bfe97934b95477042e9a287139507ebf48c7dbdb79df1038785a852dd8c4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/i386.src b/conf/i386.src index 03ff528..ed53669 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.40.0/navidrome_0.40.0_Linux_i386.tar.gz -SOURCE_SUM=6f8389326e2699c4ec22fb7430d64bc301a4bceba98e09ecc8e19a378411ffaf +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.0/navidrome_0.41.0_Linux_i386.tar.gz +SOURCE_SUM=13317bd9779a847bd49bef23b8640dd3594ff89c447024552e076c9c4424e5fd SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/x86-64.src b/conf/x86-64.src index a6b1a33..8fa1420 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.40.0/navidrome_0.40.0_Linux_x86_64.tar.gz -SOURCE_SUM=b01213087ca38b9e4e9e8a4d94308dca949ffe3f0b2ad6ab4863d8cf97d0672b +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.0/navidrome_0.41.0_Linux_x86_64.tar.gz +SOURCE_SUM=9b6f5376b5d64ce929c1d5ca655d6b52d7fe30339c93e312ccee6cc5bea5b9c2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 2507ffb..614437a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern Music Server and Streamer compatible with Subsonic/Airsonic", "fr": "Serveur de musique moderne et Streamer compatibles avec Subsonic/Airsonic" }, - "version": "0.40.0~ynh2", + "version": "0.41.0~ynh1", "url": "https://github.com/deluan/navidrome/", "license": "GPL-3.0-only", "maintainer": { diff --git a/scripts/install b/scripts/install index be3bedc..683c2bb 100644 --- a/scripts/install +++ b/scripts/install @@ -46,8 +46,8 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #================================================= ynh_script_progression --message="Storing installation settings..." --weight=2 -ynh_app_setting_set --app=$app --key=domain --value=$domain -ynh_app_setting_set --app=$app --key=path --value=$path_url +ynh_app_setting_set --app=$app --key=domain --value=$domain +ynh_app_setting_set --app=$app --key=path --value=$path_url #================================================= # STANDARD MODIFICATIONS @@ -128,8 +128,10 @@ ynh_add_systemd_config ynh_script_progression --message="Securing files and directories..." --weight=1 # Set permissions to app files -chown -R $app: "$final_path" -chown -R $app: "$config_path" +chown -R $app:$app "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:$app "$config_path" +chmod 600 "$config_path/navidrome.toml" #================================================= # INTEGRATE SERVICE IN YUNOHOST diff --git a/scripts/restore b/scripts/restore index bdeed66..606ae3f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -77,8 +77,10 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Restoring user rights..." # Restore permissions on app files -chown -R $app: "$final_path" -chown -R $app: "/var/lib/$app" +chown -R $app:$app "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:$app "/var/lib/$app" +chmod 600 "$config_path/navidrome.toml" #================================================= # SPECIFIC RESTORATION diff --git a/scripts/upgrade b/scripts/upgrade index 4bdf487..e7ce57d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -134,8 +134,10 @@ ynh_add_systemd_config ynh_script_progression --message="Securing files and directories..." # Set permissions on app files -chown -R $app: $final_path -chown -R $app: $config_path +chown -R $app:$app "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:$app "$config_path" +chmod 600 "$config_path/navidrome.toml" #================================================= # INTEGRATE SERVICE IN YUNOHOST From e31ed8496e5b646cadcdb0d747a64b3138add911 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 24 Mar 2021 08:45:17 +0100 Subject: [PATCH 20/31] Fix --- scripts/install | 3 +-- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 683c2bb..bf61fe0 100644 --- a/scripts/install +++ b/scripts/install @@ -110,7 +110,6 @@ mkdir -p "$config_path" # Main config File ynh_add_config --template="../conf/navidrome.toml" --destination="$config_path/navidrome.toml" -ynh_store_file_checksum --file="$config_path/navidrome.toml" #================================================= # SETUP SYSTEMD @@ -131,7 +130,7 @@ ynh_script_progression --message="Securing files and directories..." --weight=1 chown -R $app:$app "$final_path" chmod -R o-rwx "$final_path" chown -R $app:$app "$config_path" -chmod 600 "$config_path/navidrome.toml" +chmod 600 "/var/lib/$app/navidrome.toml" #================================================= # INTEGRATE SERVICE IN YUNOHOST diff --git a/scripts/restore b/scripts/restore index 606ae3f..f77499f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -80,7 +80,7 @@ ynh_script_progression --message="Restoring user rights..." chown -R $app:$app "$final_path" chmod -R o-rwx "$final_path" chown -R $app:$app "/var/lib/$app" -chmod 600 "$config_path/navidrome.toml" +chmod 600 "/var/lib/$app/navidrome.toml" #================================================= # SPECIFIC RESTORATION diff --git a/scripts/upgrade b/scripts/upgrade index e7ce57d..d9085d8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -137,7 +137,7 @@ ynh_script_progression --message="Securing files and directories..." chown -R $app:$app "$final_path" chmod -R o-rwx "$final_path" chown -R $app:$app "$config_path" -chmod 600 "$config_path/navidrome.toml" +chmod 600 "/var/lib/$app/navidrome.toml" #================================================= # INTEGRATE SERVICE IN YUNOHOST From 46b9670a362512e2e18e212b93cec4f34163e78e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 24 Mar 2021 08:47:11 +0100 Subject: [PATCH 21/31] Fix --- scripts/restore | 16 ++++++++-------- scripts/upgrade | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/restore b/scripts/restore index f77499f..80ee84f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -49,6 +49,14 @@ ynh_script_progression --message="Restoring the NGINX configuration..." ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +#================================================= +# RECREATE THE DEDICATED USER +#================================================= +ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 + +# Create the dedicated user (if not existing) +ynh_system_user_create --username=$app --home_dir=$final_path + #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -63,14 +71,6 @@ ynh_script_progression --message="Restoring Navidrome config directory..." --wei ynh_restore_file --origin_path="/var/lib/$app" -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 - -# Create the dedicated user (if not existing) -ynh_system_user_create --username=$app - #================================================= # RESTORE USER RIGHTS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index d9085d8..6e42272 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -64,6 +64,14 @@ ynh_script_progression --message="Stopping a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action=stop --log_path=systemd +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 + +# Create a dedicated user (if not existing) +ynh_system_user_create --username=$app --home_dir=$final_path + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -105,14 +113,6 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=8 ynh_install_app_dependencies $pkg_dependencies -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 - -# Create a dedicated user (if not existing) -ynh_system_user_create --username=$app - #================================================= # SETUP SYSTEMD #================================================= From c76763c35bdc6b73f51e45e466ae1ddb3201a1c3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 10 Apr 2021 10:49:37 +0200 Subject: [PATCH 22/31] Preserve config file --- conf/navidrome.toml | 3 +++ scripts/upgrade | 18 +++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/conf/navidrome.toml b/conf/navidrome.toml index 70f8e37..4ae039f 100644 --- a/conf/navidrome.toml +++ b/conf/navidrome.toml @@ -28,6 +28,9 @@ DataFolder = "__CONFIG_PATH__" # Folder where your music library is stored. Can be read-only MusicFolder = "/home/yunohost.multimedia/share/Music" +# Enable the option in the UI to download music/albums/artists/playlists from the server +EnableDownloads = "true" + #Change background image used in the Login page UILoginBackgroundUrl = "" diff --git a/scripts/upgrade b/scripts/upgrade index 6e42272..1f794d0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -80,10 +80,10 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=5 - # # Create a temporary directory - #tmpdir="$(mktemp -d)" - # # Backup the config file in the temp dir - # cp -a "/var/lib/$app/navidrome.toml" "$tmpdir/navidrome.toml" + # Create a temporary directory + tmpdir="$(mktemp -d)" + # Backup the config file in the temp dir + cp -a "/var/lib/$app/navidrome.toml" "$tmpdir/navidrome.toml" # Remove the app directory securely ynh_secure_remove --file=$final_path @@ -91,11 +91,11 @@ then # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir=$final_path --source_id="$architecture" - # # Copy the admin saved settings from tmp directory to final config path - # cp -a "$tmpdir/navidrome.toml" "/var/lib/$app/navidrome.toml" + # Copy the admin saved settings from tmp directory to final config path + cp -a "$tmpdir/navidrome.toml" "/var/lib/$app/navidrome.toml" - # # Remove the tmp directory securely - # ynh_secure_remove --file="$tmpdir" + # Remove the tmp directory securely + ynh_secure_remove --file="$tmpdir" fi #================================================= @@ -120,7 +120,7 @@ ynh_script_progression --message="Configuring a systemd service..." --weight=2 config_path="/var/lib/$app" -ynh_add_config --template="../conf/navidrome.toml" --destination="$config_path/navidrome.toml" +#ynh_add_config --template="../conf/navidrome.toml" --destination="$config_path/navidrome.toml" # Create a dedicated systemd config ynh_replace_string --match_string="__CONFIG_PATH__" --replace_string="$config_path" --target_file="../conf/systemd.service" From 2bbed7309af1a2ce910baeee67193c6e531adaf4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 10 Apr 2021 10:50:49 +0200 Subject: [PATCH 23/31] Fix badges --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0b8335e..544a287 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,8 @@ You must activate *public site* if you want to connect a client player to Navidr #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/navidrome%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/navidrome/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/navidrome%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/navidrome/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/navidrome.svg)](https://ci-apps.yunohost.org/ci/apps/navidrome/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/navidrome.svg)](https://ci-apps-arm.yunohost.org/ci/apps/navidrome/) ## Links diff --git a/README_fr.md b/README_fr.md index afb2333..d0e325c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -47,8 +47,8 @@ Vous devez activer *site public* si vous souhaitez connecter un lecteur client #### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/navidrome%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/navidrome/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/navidrome%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/navidrome/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/navidrome.svg)](https://ci-apps.yunohost.org/ci/apps/navidrome/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/navidrome.svg)](https://ci-apps-arm.yunohost.org/ci/apps/navidrome/) ## Liens From 494403606141f8740d173d1e69ec6762540d703d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 10 Apr 2021 10:52:50 +0200 Subject: [PATCH 24/31] Update upgrade --- scripts/upgrade | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 1f794d0..a9a4b5f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -80,22 +80,11 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=5 - # Create a temporary directory - tmpdir="$(mktemp -d)" - # Backup the config file in the temp dir - cp -a "/var/lib/$app/navidrome.toml" "$tmpdir/navidrome.toml" - # Remove the app directory securely ynh_secure_remove --file=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir=$final_path --source_id="$architecture" - - # Copy the admin saved settings from tmp directory to final config path - cp -a "$tmpdir/navidrome.toml" "/var/lib/$app/navidrome.toml" - - # Remove the tmp directory securely - ynh_secure_remove --file="$tmpdir" fi #================================================= From d4b17d421c387ff8b822b83b34eb4f9e219d2987 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 10 Apr 2021 10:59:11 +0200 Subject: [PATCH 25/31] Fix --- scripts/change_url | 14 ++++++++------ scripts/upgrade | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 69455b1..66a8984 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -109,14 +109,16 @@ ynh_script_progression --message="Modifying a config file..." --weight=1 config_path="/var/lib/$app" path_url="$new_path" -cp ../conf/navidrome.toml "$config_path/navidrome.toml" +# cp ../conf/navidrome.toml "$config_path/navidrome.toml" -# Main config File -ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_path/navidrome.toml" -ynh_replace_string --match_string="__PATH_URL__" --replace_string="$path_url" --target_file="$config_path/navidrome.toml" -ynh_replace_string --match_string="__CONFIG_PATH__" --replace_string="$config_path" --target_file="$config_path/navidrome.toml" +# # Main config File +# ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_path/navidrome.toml" +# ynh_replace_string --match_string="__PATH_URL__" --replace_string="$path_url" --target_file="$config_path/navidrome.toml" +# ynh_replace_string --match_string="__CONFIG_PATH__" --replace_string="$config_path" --target_file="$config_path/navidrome.toml" -ynh_store_file_checksum --file="$config_path/navidrome.toml" +# ynh_store_file_checksum --file="$config_path/navidrome.toml" + +ynh_add_config --template="../conf/navidrome.toml" --destination="$config_path/navidrome.toml" #================================================= # GENERIC FINALISATION diff --git a/scripts/upgrade b/scripts/upgrade index a9a4b5f..58fbb31 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -109,6 +109,7 @@ ynh_script_progression --message="Configuring a systemd service..." --weight=2 config_path="/var/lib/$app" +# Uncomment when there is new options added upstream #ynh_add_config --template="../conf/navidrome.toml" --destination="$config_path/navidrome.toml" # Create a dedicated systemd config From 13bc23edababbf411f4cec3e03847060e8bdad2f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 13 Apr 2021 20:53:49 +0200 Subject: [PATCH 26/31] Upgrade to version 0.41.1 --- README.md | 2 +- README_fr.md | 2 +- conf/arm64.src | 4 ++-- conf/armv5.src | 4 ++-- conf/armv6.src | 4 ++-- conf/armv7.src | 4 ++-- conf/i386.src | 4 ++-- conf/x86-64.src | 4 ++-- manifest.json | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 544a287..f8e43ae 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Navidrome is an open source web-based music collection server and streamer. It gives you freedom to listen to your music collection from any browser or mobile device. -**Shipped version:** 0.41.0 +**Shipped version:** 0.41.1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index d0e325c..2d1bfcf 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Navidrome est un serveur et un streamer de collection de musique en ligne open source. Il vous donne la liberté d'écouter votre playlist à partir de n'importe quel navigateur ou appareil mobile. -**Version incluse :** 0.41.0 +**Version incluse :** 0.41.1 ## Captures d'écran diff --git a/conf/arm64.src b/conf/arm64.src index 48e3f5f..5ce39d9 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.0/navidrome_0.41.0_Linux_arm64.tar.gz -SOURCE_SUM=8d7a3a236d842e38c41a672a9699cde0a86408d821c570dc4b2daa0684394a85 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.1/navidrome_0.41.1_Linux_arm64.tar.gz +SOURCE_SUM=dd2ea41746e5d88832476f7aab53e0502e46cac98ace3e46cbee32acf39ccb77 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv5.src b/conf/armv5.src index 88376bc..0c2cbb5 100644 --- a/conf/armv5.src +++ b/conf/armv5.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.0/navidrome_0.41.0_Linux_armv5.tar.gz -SOURCE_SUM=15d4017d10db7c85ae6dae006f36d329e58eebd38a663725c0f8b92f197c57d1 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.1/navidrome_0.41.1_Linux_armv5.tar.gz +SOURCE_SUM=476ca7775486f641cbee85e749bb063660e310d729d40f68e193f8227718ca7c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv6.src b/conf/armv6.src index 3a2cfed..1d01b05 100644 --- a/conf/armv6.src +++ b/conf/armv6.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.0/navidrome_0.41.0_Linux_armv6.tar.gz -SOURCE_SUM=8ef6998631e7684456898d3d46fba56d5e85c15ec390fdb06cf5c60ddb058e93 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.1/navidrome_0.41.1_Linux_armv6.tar.gz +SOURCE_SUM=7f8c5ac1a024442f5d0f5612f381d1b094a34439523d7c6c5f89cc35ed055f21 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv7.src b/conf/armv7.src index 4cfe5ab..3d61fe6 100644 --- a/conf/armv7.src +++ b/conf/armv7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.0/navidrome_0.41.0_Linux_armv7.tar.gz -SOURCE_SUM=39e6bfe97934b95477042e9a287139507ebf48c7dbdb79df1038785a852dd8c4 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.1/navidrome_0.41.1_Linux_armv7.tar.gz +SOURCE_SUM=31fb9b2ff5812bc95c278954edac03c8baf990b51493e98f3621fd3026ae8ebc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/i386.src b/conf/i386.src index ed53669..2d44923 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.0/navidrome_0.41.0_Linux_i386.tar.gz -SOURCE_SUM=13317bd9779a847bd49bef23b8640dd3594ff89c447024552e076c9c4424e5fd +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.1/navidrome_0.41.1_Linux_i386.tar.gz +SOURCE_SUM=069a01ebc7b7c3421bdad023ca2bfa537813bd96f16e848581e914dac7de8a03 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/x86-64.src b/conf/x86-64.src index 8fa1420..c887d5f 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.0/navidrome_0.41.0_Linux_x86_64.tar.gz -SOURCE_SUM=9b6f5376b5d64ce929c1d5ca655d6b52d7fe30339c93e312ccee6cc5bea5b9c2 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.1/navidrome_0.41.1_Linux_x86_64.tar.gz +SOURCE_SUM=ee9d6f201cc20d059d2436b29502f82b50b56bdeeee3f95d9196365dab2c89ba SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 614437a..3f6a412 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern Music Server and Streamer compatible with Subsonic/Airsonic", "fr": "Serveur de musique moderne et Streamer compatibles avec Subsonic/Airsonic" }, - "version": "0.41.0~ynh1", + "version": "0.41.1~ynh1", "url": "https://github.com/deluan/navidrome/", "license": "GPL-3.0-only", "maintainer": { From dc1ff0b9d4316ad160310be2310c427966ab1231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 26 Apr 2021 17:07:10 +0200 Subject: [PATCH 27/31] Upgrade to version 0.42.0 (#48) * Upgrade to version 0.42.0 --- README.md | 4 ++-- README_fr.md | 4 ++-- conf/arm64.src | 4 ++-- conf/armv5.src | 4 ++-- conf/armv6.src | 4 ++-- conf/armv7.src | 4 ++-- conf/i386.src | 4 ++-- conf/x86-64.src | 4 ++-- manifest.json | 2 +- scripts/change_url | 9 --------- 10 files changed, 17 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index f8e43ae..2037740 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,12 @@ *[Lire ce readme en français.](./README_fr.md)* > *This package allows you to install Navidrome quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview Navidrome is an open source web-based music collection server and streamer. It gives you freedom to listen to your music collection from any browser or mobile device. -**Shipped version:** 0.41.1 +**Shipped version:** 0.42.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 2d1bfcf..6597fe9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,12 +6,12 @@ *[Read this readme in english.](./README.md)* > *Ce package vous permet d'installer Navidrome rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* +Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/install) pour apprendre comment l'installer.* ## Vue d'ensemble Navidrome est un serveur et un streamer de collection de musique en ligne open source. Il vous donne la liberté d'écouter votre playlist à partir de n'importe quel navigateur ou appareil mobile. -**Version incluse :** 0.41.1 +**Version incluse :** 0.42.0 ## Captures d'écran diff --git a/conf/arm64.src b/conf/arm64.src index 5ce39d9..475ae9f 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.1/navidrome_0.41.1_Linux_arm64.tar.gz -SOURCE_SUM=dd2ea41746e5d88832476f7aab53e0502e46cac98ace3e46cbee32acf39ccb77 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.42.0/navidrome_0.42.0_Linux_arm64.tar.gz +SOURCE_SUM=65d82adac7e60784dd0134555962e0e2275c0d5d45acfcf2b5a9ecbecfcc74cd SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv5.src b/conf/armv5.src index 0c2cbb5..98c2c2a 100644 --- a/conf/armv5.src +++ b/conf/armv5.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.1/navidrome_0.41.1_Linux_armv5.tar.gz -SOURCE_SUM=476ca7775486f641cbee85e749bb063660e310d729d40f68e193f8227718ca7c +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.42.0/navidrome_0.42.0_Linux_armv5.tar.gz +SOURCE_SUM=85d7310f3502384237448f8a5788bfcc7e35952b15f34d8ab4ba26f9af77da9e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv6.src b/conf/armv6.src index 1d01b05..d9547da 100644 --- a/conf/armv6.src +++ b/conf/armv6.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.1/navidrome_0.41.1_Linux_armv6.tar.gz -SOURCE_SUM=7f8c5ac1a024442f5d0f5612f381d1b094a34439523d7c6c5f89cc35ed055f21 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.42.0/navidrome_0.42.0_Linux_armv6.tar.gz +SOURCE_SUM=e31d0d6e9b193e0fbb5e6ce16c5d4af63abd765fe775647130eee20b90b135be SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv7.src b/conf/armv7.src index 3d61fe6..2439ef6 100644 --- a/conf/armv7.src +++ b/conf/armv7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.1/navidrome_0.41.1_Linux_armv7.tar.gz -SOURCE_SUM=31fb9b2ff5812bc95c278954edac03c8baf990b51493e98f3621fd3026ae8ebc +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.42.0/navidrome_0.42.0_Linux_armv7.tar.gz +SOURCE_SUM=bf2ce55457aa5a2081cebea8644570e0e3ce0c469a7cf9a7ddca2cbd6440bb42 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/i386.src b/conf/i386.src index 2d44923..c0dadc6 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.1/navidrome_0.41.1_Linux_i386.tar.gz -SOURCE_SUM=069a01ebc7b7c3421bdad023ca2bfa537813bd96f16e848581e914dac7de8a03 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.42.0/navidrome_0.42.0_Linux_i386.tar.gz +SOURCE_SUM=ff54001da9649053ba452b51c2e1dc2fbc0382be5a3218762f26765ccb711a47 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/x86-64.src b/conf/x86-64.src index c887d5f..5a5f5a6 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.41.1/navidrome_0.41.1_Linux_x86_64.tar.gz -SOURCE_SUM=ee9d6f201cc20d059d2436b29502f82b50b56bdeeee3f95d9196365dab2c89ba +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.42.0/navidrome_0.42.0_Linux_x86_64.tar.gz +SOURCE_SUM=34ab6d5f17b8abca7931f1b1ef34b48ff3db3981c742138eaa11f867cd8982d9 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 3f6a412..7671b60 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern Music Server and Streamer compatible with Subsonic/Airsonic", "fr": "Serveur de musique moderne et Streamer compatibles avec Subsonic/Airsonic" }, - "version": "0.41.1~ynh1", + "version": "0.42.0~ynh1", "url": "https://github.com/deluan/navidrome/", "license": "GPL-3.0-only", "maintainer": { diff --git a/scripts/change_url b/scripts/change_url index 66a8984..a9e6456 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -109,15 +109,6 @@ ynh_script_progression --message="Modifying a config file..." --weight=1 config_path="/var/lib/$app" path_url="$new_path" -# cp ../conf/navidrome.toml "$config_path/navidrome.toml" - -# # Main config File -# ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_path/navidrome.toml" -# ynh_replace_string --match_string="__PATH_URL__" --replace_string="$path_url" --target_file="$config_path/navidrome.toml" -# ynh_replace_string --match_string="__CONFIG_PATH__" --replace_string="$config_path" --target_file="$config_path/navidrome.toml" - -# ynh_store_file_checksum --file="$config_path/navidrome.toml" - ynh_add_config --template="../conf/navidrome.toml" --destination="$config_path/navidrome.toml" #================================================= From 5b5582bd812017e2232d3d98a3360f5ffafad1f8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 5 May 2021 17:07:13 +0200 Subject: [PATCH 28/31] Upgrade to version 0.42.1 --- README.md | 2 +- README_fr.md | 2 +- conf/arm64.src | 4 ++-- conf/armv5.src | 4 ++-- conf/armv6.src | 4 ++-- conf/armv7.src | 4 ++-- conf/i386.src | 4 ++-- conf/x86-64.src | 4 ++-- manifest.json | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 2037740..f9c051d 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/inst ## Overview Navidrome is an open source web-based music collection server and streamer. It gives you freedom to listen to your music collection from any browser or mobile device. -**Shipped version:** 0.42.0 +**Shipped version:** 0.42.1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 6597fe9..a448a59 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/install) ## Vue d'ensemble Navidrome est un serveur et un streamer de collection de musique en ligne open source. Il vous donne la liberté d'écouter votre playlist à partir de n'importe quel navigateur ou appareil mobile. -**Version incluse :** 0.42.0 +**Version incluse :** 0.42.1 ## Captures d'écran diff --git a/conf/arm64.src b/conf/arm64.src index 475ae9f..fdd6fbd 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.42.0/navidrome_0.42.0_Linux_arm64.tar.gz -SOURCE_SUM=65d82adac7e60784dd0134555962e0e2275c0d5d45acfcf2b5a9ecbecfcc74cd +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.42.1/navidrome_0.42.1_Linux_arm64.tar.gz +SOURCE_SUM=a6ab160528dd1cf6ec66e76788d3bfc806dd4c7e95990c8bb5cf479bb248e65c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv5.src b/conf/armv5.src index 98c2c2a..cb83e7f 100644 --- a/conf/armv5.src +++ b/conf/armv5.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.42.0/navidrome_0.42.0_Linux_armv5.tar.gz -SOURCE_SUM=85d7310f3502384237448f8a5788bfcc7e35952b15f34d8ab4ba26f9af77da9e +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.42.1/navidrome_0.42.1_Linux_armv5.tar.gz +SOURCE_SUM=1ff798c698f114576b5b3c2c6928906d86b60c8f9f86a74abba31f61e84e1707 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv6.src b/conf/armv6.src index d9547da..114cd84 100644 --- a/conf/armv6.src +++ b/conf/armv6.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.42.0/navidrome_0.42.0_Linux_armv6.tar.gz -SOURCE_SUM=e31d0d6e9b193e0fbb5e6ce16c5d4af63abd765fe775647130eee20b90b135be +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.42.1/navidrome_0.42.1_Linux_armv6.tar.gz +SOURCE_SUM=e047594a4dcb4491e4a655449801d781ed1fb1a5bec0a2123561bd92794bd9a0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv7.src b/conf/armv7.src index 2439ef6..a4dab2c 100644 --- a/conf/armv7.src +++ b/conf/armv7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.42.0/navidrome_0.42.0_Linux_armv7.tar.gz -SOURCE_SUM=bf2ce55457aa5a2081cebea8644570e0e3ce0c469a7cf9a7ddca2cbd6440bb42 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.42.1/navidrome_0.42.1_Linux_armv7.tar.gz +SOURCE_SUM=b0d1b908c971f0e61eea77dc8e00fd7f3e605d2ab795e9eb8e8bd11b3a9ecf27 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/i386.src b/conf/i386.src index c0dadc6..a0a6aab 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.42.0/navidrome_0.42.0_Linux_i386.tar.gz -SOURCE_SUM=ff54001da9649053ba452b51c2e1dc2fbc0382be5a3218762f26765ccb711a47 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.42.1/navidrome_0.42.1_Linux_i386.tar.gz +SOURCE_SUM=7d40224bc31cdda63cd0e66a46bafa917f9bdbd10db65d697ab57e44de0ae9d4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/x86-64.src b/conf/x86-64.src index 5a5f5a6..9f3595f 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.42.0/navidrome_0.42.0_Linux_x86_64.tar.gz -SOURCE_SUM=34ab6d5f17b8abca7931f1b1ef34b48ff3db3981c742138eaa11f867cd8982d9 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.42.1/navidrome_0.42.1_Linux_x86_64.tar.gz +SOURCE_SUM=5b6fc49377cc4f4ef4d726c5c3429e06b90111bc34234083bb87e5848cc6cdae SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 7671b60..06d4ff5 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern Music Server and Streamer compatible with Subsonic/Airsonic", "fr": "Serveur de musique moderne et Streamer compatibles avec Subsonic/Airsonic" }, - "version": "0.42.0~ynh1", + "version": "0.42.1~ynh1", "url": "https://github.com/deluan/navidrome/", "license": "GPL-3.0-only", "maintainer": { From 83748cd219455ef90e547260c558f35834991b53 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Tue, 11 May 2021 08:33:14 +0200 Subject: [PATCH 29/31] [autopatch] Update issue and PR templates (#51) Co-authored-by: Yunohost-Bot <> --- issue_template.md | 46 ---------------------------------------- pull_request_template.md | 16 -------------- 2 files changed, 62 deletions(-) delete mode 100644 issue_template.md delete mode 100644 pull_request_template.md diff --git a/issue_template.md b/issue_template.md deleted file mode 100644 index 6c4b9d3..0000000 --- a/issue_template.md +++ /dev/null @@ -1,46 +0,0 @@ ---- -name: Bug report -about: Create a report to help us debug, it would be nice to fill the template as much as you can to help us, help you and help us all. - ---- - -**How to post a meaningful bug report** -1. *Read this whole template first.* -2. *Determine if you are on the right place:* - - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* - - *Otherwise, the issue may be due to Navidrome itself. Refer to its documentation or repository for help.* - - *If you have a doubt, post here, we will figure it out together.* -3. *Delete the italic comments as you write over them below, and remove this guide.* ---- - -**Describe the bug** -*A clear and concise description of what the bug is.* - -**Versions** -- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* -- YunoHost version: x.x.x -- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* -- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* - - If yes, please explain: -- Using, or trying to install package version/branch: -- If upgrading, current package version: *can be found in the admin, or with `yunohost app info navidrome`* - -**To Reproduce** -*Steps to reproduce the behavior.* -- *If you performed a command from the CLI, the command itself is enough. For example:* - ```sh - sudo yunohost app install navidrome - ``` -- *If you used the webadmin, please perform the equivalent command from the CLI first.* -- *If the error occurs in your browser, explain what you did:* - 1. *Go to '...'* - 2. *Click on '...'* - 3. *Scroll down to '...'* - 4. *See error* - -**Expected behavior** -*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* - -**Logs** -*After a failed command, YunoHost makes the log available to you, but also to others, thanks to `yunohost log display [log name] --share`. The actual command, with the correct log name, is displayed at the end of the failed attempt in the CLI. Execute it and copy here the share link it outputs.* -*If applicable and useful, add screenshots to help explain your problem.* diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index 6c28fc5..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,16 +0,0 @@ -## Problem -- *Description of why you made this PR* - -## Solution -- *And how do you fix that problem* - -## PR Status -- [ ] Code finished. -- [ ] Tested with Package_check. -- [ ] Fix or enhancement tested. -- [ ] Upgrade from last version tested. -- [ ] Can be reviewed and tested. - -## Package_check results ---- -* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* From 6502629e5ab2021303d18dbd8ac206cdaa32fc51 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 11 May 2021 09:52:21 +0200 Subject: [PATCH 30/31] Add templates --- .github/ISSUE_TEMPLATE.md | 55 ++++++++++++++++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 16 ++++++++++ 2 files changed, 71 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..2729a6b --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,55 @@ +--- +name: Bug report +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. + +--- + +**How to post a meaningful bug report** +1. *Read this whole template first.* +2. *Determine if you are on the right place:* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* + - *When in doubt, post here and we will figure it out together.* +3. *Delete the italic comments as you write over them below, and remove this guide.* +--- + +### Describe the bug + +*A clear and concise description of what the bug is.* + +### Context + +- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* +- YunoHost version: x.x.x +- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* + - If yes, please explain: +- Using, or trying to install package version/branch: +- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* + +### Steps to reproduce + +- *If you performed a command from the CLI, the command itself is enough. For example:* + ```sh + sudo yunohost app install the_app + ``` +- *If you used the webadmin, please perform the equivalent command from the CLI first.* +- *If the error occurs in your browser, explain what you did:* + 1. *Go to '...'* + 2. *Click on '...'* + 3. *Scroll down to '...'* + 4. *See error* + +### Expected behavior + +*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* + +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + +*If applicable and useful, add screenshots to help explain your problem.* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) From b9eed9c855a419d449a0aa21918f461e09386036 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 18 May 2021 03:30:40 +0200 Subject: [PATCH 31/31] Manage rights --- scripts/change_url | 13 ++++++---- scripts/install | 29 ++++++++++----------- scripts/restore | 32 ++++++++++------------- scripts/upgrade | 64 +++++++++++++++++++++++----------------------- 4 files changed, 67 insertions(+), 71 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index a9e6456..ffaeb28 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -31,9 +31,9 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) #================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up Navidrome before changing its URL..." --weight=1 +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 # Backup the current version of the app ynh_backup_before_upgrade @@ -41,7 +41,7 @@ ynh_clean_setup () { # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" - # restore it if the upgrade fails + # Restore it if the upgrade fails ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script @@ -70,7 +70,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action=stop --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" #================================================= # MODIFY URL IN NGINX CONF @@ -111,6 +111,9 @@ path_url="$new_path" ynh_add_config --template="../conf/navidrome.toml" --destination="$config_path/navidrome.toml" +chmod 600 "$config_path/navidrome.toml" +chown -R $app:$app "$config_path" + #================================================= # GENERIC FINALISATION #================================================= @@ -119,7 +122,7 @@ ynh_add_config --template="../conf/navidrome.toml" --destination="$config_path/n ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Version:" +ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Version:" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index bf61fe0..88e28d8 100644 --- a/scripts/install +++ b/scripts/install @@ -81,10 +81,13 @@ ynh_system_user_create --username=$app --home_dir=$final_path ynh_script_progression --message="Setting up source files..." --weight=4 ynh_app_setting_set --app=$app --key=final_path --value=$final_path - # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir=$final_path --source_id="$architecture" +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:$app "$final_path" + #================================================= # NGINX CONFIGURATION #================================================= @@ -111,27 +114,19 @@ mkdir -p "$config_path" # Main config File ynh_add_config --template="../conf/navidrome.toml" --destination="$config_path/navidrome.toml" +chmod 600 "$config_path/navidrome.toml" +chown -R $app:$app "$config_path" + #================================================= # SETUP SYSTEMD #================================================= ynh_script_progression --message="Configuring a systemd service..." --weight=1 -ynh_replace_string --match_string="__CONFIG_PATH__" --replace_string="$config_path" --target_file="../conf/systemd.service" +# Create a dedicated systemd config ynh_add_systemd_config #================================================= # GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= -ynh_script_progression --message="Securing files and directories..." --weight=1 - -# Set permissions to app files -chown -R $app:$app "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:$app "$config_path" -chmod 600 "/var/lib/$app/navidrome.toml" - #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= @@ -145,16 +140,18 @@ yunohost service add $app --description "Web-based music collection server and s ynh_script_progression --message="Starting a systemd service..." --weight=2 # Start a systemd service -ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Version:" +ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Version:" #================================================= # SETUP SSOWAT #================================================= ynh_script_progression --message="Configuring permissions..." --weight=1 -# Make app public if necessary or protect it +# Make app public if necessary if [ $is_public -eq 1 ] then + # Everyone can access the app. + # The "main" permission is automatically created before the install script. ynh_permission_update --permission="main" --add="visitors" fi @@ -169,4 +166,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of Navidrome completed" --last +ynh_script_progression --message="Installation of $app completed" --last diff --git a/scripts/restore b/scripts/restore index 80ee84f..43c15b4 100644 --- a/scripts/restore +++ b/scripts/restore @@ -64,23 +64,9 @@ ynh_script_progression --message="Restoring Navidrome main directory..." --weigh ynh_restore_file --origin_path="$final_path" -#================================================= -# RESTORE THE APP MAIN DIR -#================================================= -ynh_script_progression --message="Restoring Navidrome config directory..." --weight=2 - -ynh_restore_file --origin_path="/var/lib/$app" - -#================================================= -# RESTORE USER RIGHTS -#================================================= -ynh_script_progression --message="Restoring user rights..." - -# Restore permissions on app files -chown -R $app:$app "$final_path" +chmod 750 "$final_path" chmod -R o-rwx "$final_path" -chown -R $app:$app "/var/lib/$app" -chmod 600 "/var/lib/$app/navidrome.toml" +chown -R $app:$app "$final_path" #================================================= # SPECIFIC RESTORATION @@ -92,6 +78,16 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=7 # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies +#================================================= +# RESTORE VARIOUS FILES +#================================================= +ynh_script_progression --message="Restoring various files..." --weight=2 + +ynh_restore_file --origin_path="/var/lib/$app" + +chmod 600 "/var/lib/$app/navidrome.toml" +chown -R $app:$app "/var/lib/$app" + #================================================= # RESTORE SYSTEMD #================================================= @@ -105,14 +101,14 @@ systemctl enable $app.service --quiet #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "Web-based music collection server and streamer" +yunohost service add $app --description="Web-based music collection server and streamer" #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Version:" +ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Version:" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 58fbb31..3d173e2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -29,27 +29,15 @@ ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - -# Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public -fi - #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up Navidrome before upgrading..." --weight=4 +ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=4 # Backup the current version of the app ynh_backup_before_upgrade ynh_clean_setup () { - # restore it if the upgrade fails + # Restore it if the upgrade fails ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script @@ -62,7 +50,19 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action=stop --log_path=systemd +ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd + +#================================================= +# ENSURE DOWNWARD COMPATIBILITY +#================================================= +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 + +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi #================================================= # CREATE DEDICATED USER @@ -87,12 +87,16 @@ then ynh_setup_source --dest_dir=$final_path --source_id="$architecture" fi +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:$app "$final_path" + #================================================= # NGINX CONFIGURATION #================================================= ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -103,32 +107,28 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=8 ynh_install_app_dependencies $pkg_dependencies #================================================= -# SETUP SYSTEMD +# UPDATE A CONFIG FILE #================================================= -ynh_script_progression --message="Configuring a systemd service..." --weight=2 +ynh_script_progression --message="Updating a configuration file..." config_path="/var/lib/$app" # Uncomment when there is new options added upstream #ynh_add_config --template="../conf/navidrome.toml" --destination="$config_path/navidrome.toml" +chmod 600 "$config_path/navidrome.toml" +chown -R $app:$app "$config_path" + +#================================================= +# SETUP SYSTEMD +#================================================= +ynh_script_progression --message="Upgrading systemd configuration..." --weight=2 + # Create a dedicated systemd config -ynh_replace_string --match_string="__CONFIG_PATH__" --replace_string="$config_path" --target_file="../conf/systemd.service" ynh_add_systemd_config #================================================= # GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= -ynh_script_progression --message="Securing files and directories..." - -# Set permissions on app files -chown -R $app:$app "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:$app "$config_path" -chmod 600 "/var/lib/$app/navidrome.toml" - #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= @@ -141,7 +141,7 @@ yunohost service add $app --description "Web-based music collection server and s #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Version:" +ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Version:" #================================================= # RELOAD NGINX @@ -154,4 +154,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of Navidrome completed" --last +ynh_script_progression --message="Upgrade of $app completed" --last