From a032ecbce37b33527b0fdabc3feefa8beb36f610 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Mon, 25 Apr 2022 17:18:28 +0200 Subject: [PATCH 1/6] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index b8cd7fe..3f37d4a 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.2.3~ynh1", + "version": "1.2.4~ynh1", "url": "https://funkwhale.audio", "upstream": { "license": "AGPL-3.0-or-later", From 80a9c330bc839ad2664fc5c01cc35d2daf9d4134 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Mon, 25 Apr 2022 17:22:43 +0200 Subject: [PATCH 2/6] Upgrade --- check_process | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/check_process b/check_process index 19312aa..fcecba8 100644 --- a/check_process +++ b/check_process @@ -25,6 +25,8 @@ upgrade=1 from_commit=9fc8b84ba24260e28f791aa9c47688c1a1f085c2 # 1.2.2~ynh2 upgrade=1 from_commit=192afe93f66bb08cc7d487db02dc4d187e5b29e2 + # 1.2.3~ynh1 + upgrade=1 from_commit=1c1b64b8b04ee917a63580dce21d149182ee319d backup_restore=1 multi_instance=1 port_already_use=0 @@ -48,3 +50,5 @@ Notification=all name=1.2.1~ynh1 ; commit=192afe93f66bb08cc7d487db02dc4d187e5b29e2 name=1.2.2~ynh2 + ; commit=1c1b64b8b04ee917a63580dce21d149182ee319d + name=1.2.3~ynh1 From af20a2440fbbf02619b1663d090a3dbcb2488060 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Mon, 25 Apr 2022 17:23:57 +0200 Subject: [PATCH 3/6] Update api.src --- conf/api.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/api.src b/conf/api.src index 38877a0..ddb8750 100644 --- a/conf/api.src +++ b/conf/api.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/1.2.3/download?job=build_api -SOURCE_SUM=d9f4e923c4b025f2123cc0330d3679b9bebb13d33b97eed955ac19d742190543 +SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/1.2.4/download?job=build_api +SOURCE_SUM=8a1ff070b7bd7205fcfebdb2e8f1c92dd1ffb60fb2fe084a2bab36026575059e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true From aa14427de033ad685c93ba5b6fa31e0d234c7112 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Mon, 25 Apr 2022 17:24:43 +0200 Subject: [PATCH 4/6] Upgrade --- conf/front.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/front.src b/conf/front.src index 091a087..58383a3 100644 --- a/conf/front.src +++ b/conf/front.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/1.2.3/download?job=build_front -SOURCE_SUM=06df2e2215e131e840aa7ddf7b86ddd2cfc5d011a721e9cf2c278c2c6c34658e +SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/1.2.4/download?job=build_front +SOURCE_SUM=82e99ee29d2306cd379a61ae4c2c1d461625b74d24001d51193dafb2f18d9628 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true From 4fd2c74a57e498ff8ef1bdb69490f721344848f8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 26 Apr 2022 06:36:49 +0000 Subject: [PATCH 5/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 de6dbe3..70cdd12 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Funkwhale is a community-driven project that lets you listen and share music and audio within a decentralized, open network. -**Shipped version:** 1.2.3~ynh1 +**Shipped version:** 1.2.4~ynh1 **Demo:** https://demo.funkwhale.audio diff --git a/README_fr.md b/README_fr.md index 6a1fcc0..9859ddc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Funkwhale est un projet communautaire qui vous permet d'écouter et de partager de la musique et de l'audio au sein d'un réseau ouvert et décentralisé. -**Version incluse :** 1.2.3~ynh1 +**Version incluse :** 1.2.4~ynh1 **Démo :** https://demo.funkwhale.audio From e596f011503e1af649ab78ef00d994c7deab46a7 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 28 Apr 2022 01:15:33 +0200 Subject: [PATCH 6/6] Fix 1.2.4 --- scripts/install | 6 ++++-- scripts/restore | 4 ++-- scripts/upgrade | 6 ++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 2cd9ba1..281a190 100644 --- a/scripts/install +++ b/scripts/install @@ -174,6 +174,8 @@ pushd $final_path pip install --upgrade pip pip install --upgrade setuptools ynh_exec_warn_less pip install wheel + # Workaround for error AttributeError: module 'lib' has no attribute 'X509_V_FLAG_CB_ISSUER_CHECK' + ynh_replace_string --match_string="pyOpenSSL~=20.0.1" --replace_string="pyOpenSSL~=21.0.0" --target_file="$final_path/api/requirements/base.txt" ynh_exec_warn_less pip install -r api/requirements.txt popd @@ -214,9 +216,9 @@ yunohost service add "${app}-worker" ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" --line_match="Running with the following plugins enabled" +ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" --line_match="Started" ynh_systemd_action --service_name="${app}-server" --action="start" --log_path="systemd" --line_match="Application startup complete" -ynh_systemd_action --service_name="${app}-worker" --action="start" --log_path="systemd" --line_match="Running with the following plugins enabled" +ynh_systemd_action --service_name="${app}-worker" --action="start" --log_path="systemd" --line_match="ready" #================================================= # SETUP FAIL2BAN diff --git a/scripts/restore b/scripts/restore index 1e279a5..658b02f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -131,9 +131,9 @@ yunohost service add "${app}-worker" #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" --line_match="Running with the following plugins enabled" +ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" --line_match="Started" ynh_systemd_action --service_name="${app}-server" --action="start" --log_path="systemd" --line_match="Application startup complete" -ynh_systemd_action --service_name="${app}-worker" --action="start" --log_path="systemd" --line_match="Running with the following plugins enabled" +ynh_systemd_action --service_name="${app}-worker" --action="start" --log_path="systemd" --line_match="ready" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 02a3bc8..c424e35 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -197,6 +197,8 @@ pushd $final_path pip install --upgrade pip pip install --upgrade setuptools ynh_exec_warn_less pip install wheel + # Workaround for error AttributeError: module 'lib' has no attribute 'X509_V_FLAG_CB_ISSUER_CHECK' + ynh_replace_string --match_string="pyOpenSSL~=20.0.1" --replace_string="pyOpenSSL~=21.0.0" --target_file="$final_path/api/requirements/base.txt" ynh_exec_warn_less pip install -r api/requirements.txt popd @@ -277,9 +279,9 @@ yunohost service add "${app}-worker" ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" --line_match="Running with the following plugins enabled" +ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" --line_match="Started" ynh_systemd_action --service_name="${app}-server" --action="start" --log_path="systemd" --line_match="Application startup complete" -ynh_systemd_action --service_name="${app}-worker" --action="start" --log_path="systemd" --line_match="Running with the following plugins enabled" +ynh_systemd_action --service_name="${app}-worker" --action="start" --log_path="systemd" --line_match="ready" #================================================= # UPGRADE FAIL2BAN