From 0574bcd732858190deeb080b2dd3806533f75ee1 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 13 May 2021 22:35:44 +0200 Subject: [PATCH 01/12] remove others_var --- check_process | 6 +++++- manifest.json | 4 ++-- scripts/install | 6 +++--- scripts/upgrade | 6 +++--- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/check_process b/check_process index ea05a96..de19364 100644 --- a/check_process +++ b/check_process @@ -19,7 +19,9 @@ # 0.19.1 upgrade=1 from_commit=4d4bf0981e2d3a00eaae6b19bd54344fe55d6530 # 1.1~ynh1 - upgrade=1 from_commit=8172790fb461d16f09089593fdac380f0d499c83 + upgrade=1 from_commit=8172790fb461d16f09089593fdac380f0d499c83 + # 1.1.1~ynh1 + upgrade=1 from_commit=fa9587f61e4bb4f9db8667b1c6701ede37ac8e91 backup_restore=1 multi_instance=1 incorrect_path=0 @@ -34,3 +36,5 @@ Notification=all manifest_arg=domain=DOMAIN&path=/&admin=USER&is_public=1 ; commit=8172790fb461d16f09089593fdac380f0d499c83 name=1.1~ynh1 + ; commit=fa9587f61e4bb4f9db8667b1c6701ede37ac8e91 + name=1.1.1~ynh1 diff --git a/manifest.json b/manifest.json index 08991a5..d4b73ce 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern, convivial and free music server", "fr": "Serveur de musique moderne, convivial et gratuit" }, - "version": "1.1.1~ynh1", + "version": "1.1.1~ynh2", "url": "https://funkwhale.audio", "license": "AGPL-3.0-or-later", "maintainer": { @@ -18,7 +18,7 @@ "email": "jean-baptiste@holcroft.fr" }], "requirements": { - "yunohost": ">= 4.1.3" + "yunohost": ">= 4.2.0" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index bf0e8cb..08c4709 100644 --- a/scripts/install +++ b/scripts/install @@ -158,9 +158,9 @@ ynh_script_progression --message="Configuring a systemd service..." ynh_add_config --template="../conf/funkwhale.target" --destination="/etc/systemd/system/$app.target" # Create a dedicated systemd config -ynh_add_systemd_config --service="${app}-server" --template="funkwhale-server.service" --others_var="datadir" -ynh_add_systemd_config --service="${app}-worker" --template="funkwhale-worker.service" --others_var="datadir" -ynh_add_systemd_config --service="${app}-beat" --template="funkwhale-beat.service" --others_var="datadir" +ynh_add_systemd_config --service="${app}-server" --template="funkwhale-server.service" +ynh_add_systemd_config --service="${app}-worker" --template="funkwhale-worker.service" +ynh_add_systemd_config --service="${app}-beat" --template="funkwhale-beat.service" #================================================= # INSTALL PYTHON DEPENDENCIES diff --git a/scripts/upgrade b/scripts/upgrade index aa21fd0..60e2228 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -265,9 +265,9 @@ ynh_script_progression --message="Upgrading systemd configuration..." ynh_add_config --template="../conf/funkwhale.target" --destination="/etc/systemd/system/$app.target" # Create a dedicated systemd config -ynh_add_systemd_config --service="${app}-server" --template="funkwhale-server.service" --others_var="datadir" -ynh_add_systemd_config --service="${app}-worker" --template="funkwhale-worker.service" --others_var="datadir" -ynh_add_systemd_config --service="${app}-beat" --template="funkwhale-beat.service" --others_var="datadir" +ynh_add_systemd_config --service="${app}-server" --template="funkwhale-server.service" +ynh_add_systemd_config --service="${app}-worker" --template="funkwhale-worker.service" +ynh_add_systemd_config --service="${app}-beat" --template="funkwhale-beat.service" #================================================= # GENERIC FINALIZATION From 2bf5019a3842a01aa3b454b3fff6cd09cbf825f0 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 13 May 2021 23:13:40 +0200 Subject: [PATCH 02/12] no more needed --- scripts/_common.sh | 61 ---------------------------------------------- 1 file changed, 61 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 9916587..dc8c79b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -63,64 +63,3 @@ ynh_redis_remove_db() { local db=$1 redis-cli -n "$db" flushall } - -# Send an email to inform the administrator -# -# usage: ynh_send_readme_to_admin app_message [recipients] -# | arg: app_message - The message to send to the administrator. -# | arg: recipients - The recipients of this email. Use spaces to separate multiples recipients. - default: root -# example: "root admin@domain" -# If you give the name of a YunoHost user, ynh_send_readme_to_admin will find its email adress for you -# example: "root admin@domain user1 user2" -ynh_send_readme_to_admin() { - local app_message="${1:-...No specific information...}" - local recipients="${2:-root}" - - # Retrieve the email of users - find_mails () { - local list_mails="$1" - local mail - local recipients=" " - # Read each mail in argument - for mail in $list_mails - do - # Keep root or a real email address as it is - if [ "$mail" = "root" ] || echo "$mail" | grep --quiet "@" - then - recipients="$recipients $mail" - else - # But replace an user name without a domain after by its email - if mail=$(ynh_user_get_info "$mail" "mail" 2> /dev/null) - then - recipients="$recipients $mail" - fi - fi - done - echo "$recipients" - } - recipients=$(find_mails "$recipients") - - local mail_subject="☁️🆈🅽🅷☁️: \`$app\` was just installed!" - - local mail_message="This is an automated message from your beloved YunoHost server. - -Specific information for the application $app. - -$app_message - ---- -Automatic diagnosis data from YunoHost - -$(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')" - - # Define binary to use for mail command - if [ -e /usr/bin/bsd-mailx ] - then - local mail_bin=/usr/bin/bsd-mailx - else - local mail_bin=/usr/bin/mail.mailutils - fi - - # Send the email to the recipients - echo "$mail_message" | $mail_bin -a "Content-Type: text/plain; charset=UTF-8" -s "$mail_subject" "$recipients" -} From 631b8344b40a8202ef9260cfcdef185e4e074682 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 19 May 2021 15:39:50 +0200 Subject: [PATCH 03/12] Upgrade to 1.1.2 --- conf/api.src | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/api.src b/conf/api.src index 2f4f89c..70d6744 100644 --- a/conf/api.src +++ b/conf/api.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/1.1.1/download?job=build_api -SOURCE_SUM=c77ebc37378df26a621f5f702fad3f94b56207bbfd69001bda4b45bcda515332 +SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/1.1.2/download?job=build_api +SOURCE_SUM=b05b9852b95ed6585433f154980515275a727a67479f4cb63594727728eb4bba SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=api_1.1.1.zip +SOURCE_FILENAME=api_1.1.2.zip SOURCE_EXTRACT=true From 27b56bbfbdc73a5d1c80ae3de881ce27a01068fd Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 19 May 2021 15:41:22 +0200 Subject: [PATCH 04/12] Upgrade to 1.1.2 --- conf/front.src | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/front.src b/conf/front.src index 7b550d4..23c8cff 100644 --- a/conf/front.src +++ b/conf/front.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/1.1.1/download?job=build_front -SOURCE_SUM=d94f0deaa88b8d90dd10b363cf817a80f9d2822419e8bbc7282bacd27351127b +SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/1.1.2/download?job=build_front +SOURCE_SUM=746f204834faba05a10104223509d8d012d989a98510b73b232d8ebcd17dddf3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=front_1.1.1.zip +SOURCE_FILENAME=front_master.zip SOURCE_EXTRACT=true From 2049142114b793ab6cd780f6b38472045a437aa6 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 19 May 2021 15:41:48 +0200 Subject: [PATCH 05/12] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index d4b73ce..4389aff 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern, convivial and free music server", "fr": "Serveur de musique moderne, convivial et gratuit" }, - "version": "1.1.1~ynh2", + "version": "1.1.2~ynh1", "url": "https://funkwhale.audio", "license": "AGPL-3.0-or-later", "maintainer": { From 2f4e63e114e6e05a8ddb8c5eeec6e6a880c37890 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 19 May 2021 15:42:05 +0200 Subject: [PATCH 06/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5d3d9d0..e1b4e6f 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ A modern, convivial and free music server on YunoHost Installation requires a dedicated domain or subdomain. Installing in a subpath is not supported by the upstream project due to dependency requirements. -**Shipped version:** 1.1.1 +**Shipped version:** 1.1.2 ## Screenshots From 804a08cb96d0a1ecdc93ca2bd615100b3f7fcb2a Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 19 May 2021 15:42:22 +0200 Subject: [PATCH 07/12] Update README_fr.md --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index b99c61e..a61b722 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Un serveur de musique moderne, convivial et gratuit sur YunoHost L'installation nécessite un domaine ou un sous-domaine dédié. L'installation dans un chemin du domaine n'est pas prise en charge par le projet en amont en raison des exigences de dépendance. -**Version incluse :** 1.1.1 +**Version incluse :** 1.1.2 ## Captures d'écran From 0f0a36b417046eecc5a376b438be9606b8782405 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 19 May 2021 15:45:03 +0200 Subject: [PATCH 08/12] Update check_process --- check_process | 3 --- 1 file changed, 3 deletions(-) diff --git a/check_process b/check_process index de19364..ef8ac83 100644 --- a/check_process +++ b/check_process @@ -31,9 +31,6 @@ Email=cda@rootkey.co.uk Notification=all ;;; Upgrade options - ; commit=4d4bf0981e2d3a00eaae6b19bd54344fe55d6530 - name=Upgrade to 0.19.1 and fix channels-redis bug - manifest_arg=domain=DOMAIN&path=/&admin=USER&is_public=1 ; commit=8172790fb461d16f09089593fdac380f0d499c83 name=1.1~ynh1 ; commit=fa9587f61e4bb4f9db8667b1c6701ede37ac8e91 From ac73a3a6bc8a09eed9bba1ad9e32a799fb6cb91e Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 19 May 2021 15:48:35 +0200 Subject: [PATCH 09/12] Update check_process --- check_process | 2 -- 1 file changed, 2 deletions(-) diff --git a/check_process b/check_process index ef8ac83..0a5d2d7 100644 --- a/check_process +++ b/check_process @@ -16,8 +16,6 @@ setup_private=1 setup_public=1 upgrade=1 - # 0.19.1 - upgrade=1 from_commit=4d4bf0981e2d3a00eaae6b19bd54344fe55d6530 # 1.1~ynh1 upgrade=1 from_commit=8172790fb461d16f09089593fdac380f0d499c83 # 1.1.1~ynh1 From 37a840242585fba980c52827c4955ae834d6c9f6 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 19 May 2021 16:17:50 +0200 Subject: [PATCH 10/12] Update api.src --- conf/api.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/api.src b/conf/api.src index 70d6744..5b93b90 100644 --- a/conf/api.src +++ b/conf/api.src @@ -3,5 +3,5 @@ SOURCE_SUM=b05b9852b95ed6585433f154980515275a727a67479f4cb63594727728eb4bba SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=api_1.1.2.zip +SOURCE_FILENAME=api_master.zip SOURCE_EXTRACT=true From f22fd156351e83aa203a26d9fbbe3e23a5ada9fc Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 19 May 2021 16:27:46 +0200 Subject: [PATCH 11/12] Update api.src --- conf/api.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/api.src b/conf/api.src index 5b93b90..d2878e9 100644 --- a/conf/api.src +++ b/conf/api.src @@ -1,5 +1,5 @@ SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/1.1.2/download?job=build_api -SOURCE_SUM=b05b9852b95ed6585433f154980515275a727a67479f4cb63594727728eb4bba +SOURCE_SUM=a0057edcff716327e49eafe7cff95e64919f8e6f32541525cc1462a25097635e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true From c56621c8649de7e923c9cc37a579eeea2826605a Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 19 May 2021 21:11:13 +0200 Subject: [PATCH 12/12] Update check_process --- check_process | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/check_process b/check_process index 0a5d2d7..de19364 100644 --- a/check_process +++ b/check_process @@ -16,6 +16,8 @@ setup_private=1 setup_public=1 upgrade=1 + # 0.19.1 + upgrade=1 from_commit=4d4bf0981e2d3a00eaae6b19bd54344fe55d6530 # 1.1~ynh1 upgrade=1 from_commit=8172790fb461d16f09089593fdac380f0d499c83 # 1.1.1~ynh1 @@ -29,6 +31,9 @@ Email=cda@rootkey.co.uk Notification=all ;;; Upgrade options + ; commit=4d4bf0981e2d3a00eaae6b19bd54344fe55d6530 + name=Upgrade to 0.19.1 and fix channels-redis bug + manifest_arg=domain=DOMAIN&path=/&admin=USER&is_public=1 ; commit=8172790fb461d16f09089593fdac380f0d499c83 name=1.1~ynh1 ; commit=fa9587f61e4bb4f9db8667b1c6701ede37ac8e91