From 36b57bab5e960a6e914fa00c5c5d27cd8f1f6feb Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Thu, 2 Nov 2023 00:09:56 +0100 Subject: [PATCH 1/6] Update upgrade checks deleted upgrades from certain versions as they cannot be installed anymore --- check_process | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index cba90fe..f973dc4 100644 --- a/check_process +++ b/check_process @@ -13,9 +13,9 @@ setup_public=1 upgrade=1 # 3.1.1~ynh2 - upgrade=1 from_commit=bc421d01d57a273a59287cf7500e94a89de0abed + # upgrade=1 from_commit=bc421d01d57a273a59287cf7500e94a89de0abed # 3.2.0~ynh1 - upgrade=1 from_commit=31c5de684273794e4f4837d5dccc5a663ce9fb45 + # upgrade=1 from_commit=31c5de684273794e4f4837d5dccc5a663ce9fb45 backup_restore=1 multi_instance=0 port_already_use=0 From 284bf6831b26a8f51d53c0dbb7d9840e21190bcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 Nov 2023 13:03:19 +0100 Subject: [PATCH 2/6] cleaning --- conf/nginx.conf | 8 ++++---- manifest.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 4d4b142..a434d4a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,6 +1,6 @@ location /mopidy/ws { - proxy_pass http://localhost:__PORT__; + proxy_pass http://127.0.0.1:__PORT__; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header Upgrade $http_upgrade; @@ -12,7 +12,7 @@ location /mopidy/ws { location __PATH__/ { - proxy_pass http://localhost:__PORT__/musicbox_webclient/; + proxy_pass http://127.0.0.1:__PORT__/musicbox_webclient/; proxy_http_version 1.1; proxy_set_header Host $host; @@ -22,7 +22,7 @@ location __PATH__/ { location /musicbox_webclient/ { - proxy_pass http://localhost:__PORT__; + proxy_pass http://127.0.0.1:__PORT__; proxy_http_version 1.1; proxy_set_header Host $host; @@ -32,7 +32,7 @@ location /musicbox_webclient/ { location /local/ { - proxy_pass http://localhost:__PORT__; + proxy_pass http://127.0.0.1:__PORT__; proxy_http_version 1.1; proxy_set_header Host $host; diff --git a/manifest.json b/manifest.json index c5a5a1f..d329cc9 100644 --- a/manifest.json +++ b/manifest.json @@ -24,7 +24,7 @@ "email": "cyp@rouquin.me" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.2" }, "multi_instance": false, "services": [ @@ -47,7 +47,7 @@ "type": "boolean", "help": { "en": "Public app can be used by anonymous visitors.", - "fr": "L'application publique peut être utilisée par des visiteurs anonymes " + "fr": "L'application publique peut être utilisée par des visiteurs anonymes." }, "default": false }, From 48f0b4f627524dcf769e0e0d11e8bb73f60b16a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 Nov 2023 13:04:49 +0100 Subject: [PATCH 3/6] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 864414c..5c74c49 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -37,7 +37,7 @@ myynh_install() { ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-local==3.2.1 ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-MusicBox-Webclient==3.1.0 ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-YouTube==3.7 - ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir mopidy-ytmusic==0.3.8 + ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-YTMusic==0.3.8 ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-RadioNet==0.2.2 ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-Podcast==3.0.1 ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-Podcast-iTunes==3.0.1 From 7a72024909b0c5ef8a21c63f3cdff8d8d3c9247d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 Nov 2023 13:16:22 +0100 Subject: [PATCH 4/6] Update upgrade --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 5fd0fa0..cd479b8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -124,7 +124,6 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Updating a configuration file..." -media_dir="/home/yunohost.multimedia/share/Music" ynh_add_config --template="../conf/app.conf" --destination="$final_path/$app.conf" chmod 400 "$final_path/$app.conf" From da21a5bb03915039b20c7518766928ebb6a0118e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 Nov 2023 13:49:41 +0100 Subject: [PATCH 5/6] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index d329cc9..148eb31 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Play music, podcasts and radio programs from local disk and various streaming services", "fr": "Écouter de la musique, des podcasts et des programmes radio depuis le disque local et divers services de streaming" }, - "version": "3.4.2~ynh2", + "version": "3.4.2~ynh3", "url": "https://www.mopidy.com", "upstream": { "license": "Apache-2.0", From 889410764189a1dbf9b9225b54b47707a3fab2a9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 2 Nov 2023 12:49:52 +0000 Subject: [PATCH 6/6] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 60e64f7..bfc75d7 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Play music, podcasts and radio programs from local disk and various streaming services -**Shipped version:** 3.4.2~ynh2 +**Shipped version:** 3.4.2~ynh3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index bd680fc..f0a200b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Écouter de la musique, des podcasts et des programmes radio depuis le disque local et divers services de streaming -**Version incluse :** 3.4.2~ynh2 +**Version incluse :** 3.4.2~ynh3 ## Captures d’écran