From 5817b9e74d3436e5742ea92ef1b0c53eb9fa7e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 1 Feb 2023 10:00:28 +0100 Subject: [PATCH] Testing (#88) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * preserve config file * [autopatch] Add Common Platform Enumeration id to `manifest.json` (#80) Co-authored-by: Yunohost-Bot <> * Auto-update README * Update manifest.json * Update upgrade * Update upgrade * 0.48.0 (#82) * 0.48.0 * Auto-update README * Update manifest.json * Auto-update README * Update ss-desktop-player.png * Update systemd.service * Update install * Update upgrade * Update change_url Co-authored-by: yunohost-bot * Disable the activity panel that hangs some browsers (#86) * Testing (#84) * preserve config file * [autopatch] Add Common Platform Enumeration id to `manifest.json` (#80) Co-authored-by: Yunohost-Bot <> * Auto-update README * Update manifest.json * Update upgrade * Update upgrade * 0.48.0 (#82) * 0.48.0 * Auto-update README * Update manifest.json * Auto-update README * Update ss-desktop-player.png * Update systemd.service * Update install * Update upgrade * Update change_url Co-authored-by: yunohost-bot Co-authored-by: YunoHost Bot Co-authored-by: yunohost-bot * Disable the activity panel that hangs some browsers Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: YunoHost Bot Co-authored-by: yunohost-bot * Auto-update README * Update manifest.json * Auto-update README * Auto-update README * 0.49.0_ * Auto-update README * Add enable sharing to config panel * #85 * Update change_url --------- Co-authored-by: YunoHost Bot Co-authored-by: yunohost-bot Co-authored-by: selfhoster1312 <121760708+selfhoster1312@users.noreply.github.com> --- README.md | 4 ++-- README_fr.md | 4 ++-- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- conf/navidrome.toml | 8 ++++++++ config_panel.toml | 8 ++++++++ manifest.json | 2 +- scripts/change_url | 1 + scripts/install | 2 ++ scripts/upgrade | 14 ++++++++++---- 11 files changed, 40 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index ea671af..4b41072 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Navidrome for YunoHost -[![Integration level](https://dash.yunohost.org/integration/navidrome.svg)](https://dash.yunohost.org/appci/app/navidrome) ![Working status](https://ci-apps.yunohost.org/ci/badges/navidrome.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/navidrome.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/navidrome.svg)](https://dash.yunohost.org/appci/app/navidrome) ![Working status](https://ci-apps.yunohost.org/ci/badges/navidrome.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/navidrome.maintain.svg) [![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)* @@ -32,7 +32,7 @@ Navidrome indexes all digital music stored in your hard drive and makes it avail - Transcoding on the fly. Can be set per user/player. Opus encoding is supported -**Shipped version:** 0.48.0~ynh2 +**Shipped version:** 0.49.0~ynh1 **Demo:** https://demo.navidrome.org/app/#/login diff --git a/README_fr.md b/README_fr.md index 151b466..f107394 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Navidrome pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/navidrome.svg)](https://dash.yunohost.org/appci/app/navidrome) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/navidrome.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/navidrome.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/navidrome.svg)](https://dash.yunohost.org/appci/app/navidrome) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/navidrome.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/navidrome.maintain.svg) [![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)* @@ -31,7 +31,7 @@ Navidrome indexe toute la musique numérique stockée sur votre disque dur et la - Compatible avec tous les clients subsonique/madsononique/aironique - Encodage à la volée. Peut être défini par utilisateur/lecteur. Le codage opus est pris en charge -**Version incluse :** 0.48.0~ynh2 +**Version incluse :** 0.49.0~ynh1 **Démo :** https://demo.navidrome.org/app/#/login diff --git a/conf/amd64.src b/conf/amd64.src index 87c2450..b54d531 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.48.0/navidrome_0.48.0_Linux_x86_64.tar.gz -SOURCE_SUM=e8d98fb6ce73ac0878ec404b430f2a5b1589515a569072089a4cf6b419bc5f90 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.49.0/navidrome_0.49.0_Linux_x86_64.tar.gz +SOURCE_SUM=ec99b71df13ffbae1b8223a89672d448904509c1d5ccaeeb9699271b46067dfd SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/arm64.src b/conf/arm64.src index 45607ef..f452621 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.48.0/navidrome_0.48.0_Linux_arm64.tar.gz -SOURCE_SUM=f2bbb57d453ce6b06b84bccf57189a6e3258d943d552dfcf58e32720fb4e90ea +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.49.0/navidrome_0.49.0_Linux_arm64.tar.gz +SOURCE_SUM=d717d45f3421a56c3dd8dccdaa9a5c5d71b26663654dd96c619a52d906e3de6d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armhf.src b/conf/armhf.src index dd41823..3779679 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.48.0/navidrome_0.48.0_Linux_armv7.tar.gz -SOURCE_SUM=cf078d3e7064597a128e9d82ae92e3055844bbdd63d264603cd54d53414b9919 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.49.0/navidrome_0.49.0_Linux_armv7.tar.gz +SOURCE_SUM=1e0638820f3ede944fdb6d54d118eb349a32e238a1a07ba29843f8d846f13d4c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/navidrome.toml b/conf/navidrome.toml index 4aa170f..6bdfb5b 100644 --- a/conf/navidrome.toml +++ b/conf/navidrome.toml @@ -100,3 +100,11 @@ DefaultLanguage="__LANGUAGE__" # Disable the activity panel that can hang some browsers with >100% CPU usage # See https://github.com/navidrome/navidrome/issues/1511 DevActivityPanel=false + +# Enable the Sharing feature +EnableSharing="__ENABLE_SHARING__" + +# Enable SSOWat authentication for all IP addresses +# If SSOWat didn't authenticate a user, manual login will still work (eg. for API) +ReverseProxyUserHeader = "remote-user" +ReverseProxyWhitelist = "0.0.0.0/0" diff --git a/config_panel.toml b/config_panel.toml index 1cef0dd..19e0c77 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -23,6 +23,14 @@ services = ["__APP__"] help = "Enable the option in the UI to download music/albums/artists/playlists from the server" bind = "EnableDownloads:/var/lib/navidrome/navidrome.toml" + [main.config.enable_sharing] + ask = "Enable Sharing feature" + type = "boolean" + yes = "true" + no = "false" + help = "Enable the Sharing feature" + bind = "EnableSharing:/var/lib/navidrome/navidrome.toml" + [main.config.scanner_extractor] ask = "Select metadata extractor" type = "select" diff --git a/manifest.json b/manifest.json index 12bcf12..da2bb0d 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.48.0~ynh2", + "version": "0.49.0~ynh1", "url": "https://www.navidrome.org", "upstream": { "license": "GPL-3.0-only", diff --git a/scripts/change_url b/scripts/change_url index f791588..68ca82d 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -36,6 +36,7 @@ scanner_extractor=$(ynh_app_setting_get --app=$app --key=scanner_extractor) enable_animation=$(ynh_app_setting_get --app=$app --key=enable_animation) enable_transcoding=$(ynh_app_setting_get --app=$app --key=enable_transcoding) welcome_message=$(ynh_app_setting_get --app=$app --key=welcome_message) +enable_sharing=$(ynh_app_setting_get --app=$app --key=enable_sharing) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP diff --git a/scripts/install b/scripts/install index e50eefd..ef8edab 100644 --- a/scripts/install +++ b/scripts/install @@ -35,6 +35,7 @@ enable_downloads="true" enable_animation="true" enable_transcoding="false" welcome_message="" +enable_sharing="false" #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS @@ -60,6 +61,7 @@ ynh_app_setting_set --app=$app --key=scanner_extractor --value=$scanner_extracto ynh_app_setting_set --app=$app --key=enable_animation --value=$enable_animation ynh_app_setting_set --app=$app --key=enable_transcoding --value=$enable_transcoding ynh_app_setting_set --app=$app --key=welcome_message --value=$welcome_message +ynh_app_setting_set --app=$app --key=enable_sharing --value=$enable_sharing #================================================= # STANDARD MODIFICATIONS diff --git a/scripts/upgrade b/scripts/upgrade index 24282f4..b777268 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,6 +27,7 @@ scanner_extractor=$(ynh_app_setting_get --app=$app --key=scanner_extractor) enable_animation=$(ynh_app_setting_get --app=$app --key=enable_animation) enable_transcoding=$(ynh_app_setting_get --app=$app --key=enable_transcoding) welcome_message=$(ynh_app_setting_get --app=$app --key=welcome_message) +enable_sharing=$(ynh_app_setting_get --app=$app --key=enable_sharing) #================================================= # CHECK VERSION @@ -100,6 +101,11 @@ if [ -z "$welcome_message" ]; then ynh_app_setting_set --app=$app --key=welcome_message --value=$welcome_message fi +if [ -z "$enable_sharing" ]; then + enable_sharing="false" + ynh_app_setting_set --app=$app --key=enable_sharing --value=$enable_sharing +fi + #================================================= # CREATE DEDICATED USER #================================================= @@ -149,11 +155,11 @@ ynh_add_nginx_config 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" +# 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" +chmod 600 "$config_path/navidrome.toml" +chown -R $app:$app "$config_path" #================================================= # SETUP SYSTEMD