From 7d5c05c65174d6b0fec5b0a1bf6b16638f3ad24b Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 3 Aug 2023 01:19:34 +0200 Subject: [PATCH 1/3] Fix service stop --- manifest.json | 2 +- scripts/_common.sh | 2 +- scripts/change_url | 4 ++-- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest.json b/manifest.json index b607c8c..e286bf5 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Distributed pastebin with ActivityPub.", "fr": "Pastebin distribué utilisant le protocole ActivityPub." }, - "version": "1.3.0~ynh10", + "version": "1.3.0~ynh11", "url": "https://distbin.com", "upstream": { "license": "Apache-2.0", diff --git a/scripts/_common.sh b/scripts/_common.sh index 0d2ca6e..80678ad 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="ca-certificates curl sudo" +pkg_dependencies="ca-certificates curl sudo rsync" NODEJS_VERSION=10 diff --git a/scripts/change_url b/scripts/change_url index 979258e..781a0db 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -71,7 +71,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." -ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped Distbin Service" +ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped" #================================================= # MODIFY URL IN NGINX CONF @@ -139,7 +139,7 @@ ynh_store_file_checksum --file="$config" ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Started Distbin Service" +ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Started" if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then sleep 60 diff --git a/scripts/install b/scripts/install index 6670c30..9cbe80d 100644 --- a/scripts/install +++ b/scripts/install @@ -182,7 +182,7 @@ yunohost service add $app --description="Distributed pastebin" --log="/var/log/$ ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Started Distbin Service" +ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Started" if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then sleep 60 diff --git a/scripts/restore b/scripts/restore index 4680052..793c6fa 100644 --- a/scripts/restore +++ b/scripts/restore @@ -130,7 +130,7 @@ yunohost service add $app --description="Distributed pastebin" --log="/var/log/$ #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Started Distbin Service" +ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Started" if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then sleep 60 diff --git a/scripts/upgrade b/scripts/upgrade index 03b2bab..44140c9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -51,7 +51,7 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Stopping a systemd service..." -ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped Distbin Service" +ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped" #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -203,7 +203,7 @@ yunohost service add $app --description="Distributed pastebin" --log="/var/log/$ #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Started Distbin Service" +ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Started" if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then sleep 60 From f4e95c73ac29f0183b170f9d7ccecb2a496717e8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 2 Aug 2023 23:19:39 +0000 Subject: [PATCH 2/3] 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 743738e..3a72c5b 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ A networked place to store posted web documents. This is meant to allow for dist - Excepteur sint occaecat cupidatat non proident, sunt in culpa." -**Shipped version:** 1.3.0~ynh10 +**Shipped version:** 1.3.0~ynh11 **Demo:** https://distbin.com/ diff --git a/README_fr.md b/README_fr.md index 0ced20b..0723d48 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ A networked place to store posted web documents. This is meant to allow for dist - Excepteur sint occaecat cupidatat non proident, sunt in culpa." -**Version incluse :** 1.3.0~ynh10 +**Version incluse :** 1.3.0~ynh11 **Démo :** https://distbin.com/ From 55f70b5c57c79b7e34c8fcb3bceee2f800baca55 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 3 Aug 2023 23:07:57 +0200 Subject: [PATCH 3/3] Update check_process --- check_process | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/check_process b/check_process index 025d6eb..62bf58b 100644 --- a/check_process +++ b/check_process @@ -12,15 +12,15 @@ setup_public=1 upgrade=1 # 1.2.0~ynh3 - upgrade=1 from_commit=b01da8e6f8d621a1b9c7aec4b82bbe96c0e7cc03 + #upgrade=1 from_commit=b01da8e6f8d621a1b9c7aec4b82bbe96c0e7cc03 # 1.3.0~ynh4 - upgrade=1 from_commit=0dda384e84bbe2513cb67cfd1eef15d667e50354 + #upgrade=1 from_commit=0dda384e84bbe2513cb67cfd1eef15d667e50354 # 1.3.0~ynh5 - upgrade=1 from_commit=f7bc083d037eb771afeddc2237a24505a5ef1c68 + #upgrade=1 from_commit=f7bc083d037eb771afeddc2237a24505a5ef1c68 # 1.3.0~ynh6 - upgrade=1 from_commit=cdec64125b179f6b19470ceb8379225ed03c10a8 + #upgrade=1 from_commit=cdec64125b179f6b19470ceb8379225ed03c10a8 # 1.3.0~ynh7 - upgrade=1 from_commit=481c0c5ce62caa9c79a6bd536f390f3814128b3a + #upgrade=1 from_commit=481c0c5ce62caa9c79a6bd536f390f3814128b3a # 1.3.0~ynh8 upgrade=1 from_commit=e53a85de775501b13d8ef9c546d6b523c0a99e4f backup_restore=1