From 7fa6303fec429b7be3a374a9d85bdc0e479cfb97 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Mon, 8 Nov 2021 23:48:40 +0100 Subject: [PATCH 1/4] Downgrade NodeJS req and do not force npm audit fix --- scripts/_common.sh | 2 +- scripts/install | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 28d89ae..01dc4fc 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=16 +nodejs_version=14 # dependencies used by the app pkg_dependencies="g++" diff --git a/scripts/install b/scripts/install index cc1a81c..f3af27e 100644 --- a/scripts/install +++ b/scripts/install @@ -113,7 +113,7 @@ pushd $final_path/src ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install node-gyp ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install argon2-cli ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install - ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm audit fix --force + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm audit fix popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 79ae1bb..a9990c6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -142,7 +142,7 @@ pushd $final_path/src ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH HOME=$final_path $ynh_npm install node-gyp ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH HOME=$final_path $ynh_npm install argon2-cli ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH HOME=$final_path $ynh_npm install - ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH HOME=$final_path $ynh_npm audit fix --force + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH HOME=$final_path $ynh_npm audit fix popd #================================================= From 32823caf8d926549669e608fbdfa4074350930ab Mon Sep 17 00:00:00 2001 From: tituspijean Date: Mon, 8 Nov 2021 23:53:40 +0100 Subject: [PATCH 2/4] Delete log directory while removing app --- scripts/remove | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/remove b/scripts/remove index 9641422..54b350d 100644 --- a/scripts/remove +++ b/scripts/remove @@ -75,6 +75,16 @@ ynh_script_progression --message="Removing logrotate configuration..." --weight= # Remove the app-specific logrotate config ynh_remove_logrotate +#================================================= +# SPECIFIC REMOVE +#================================================= +# REMOVE VARIOUS FILES +#================================================= +ynh_script_progression --message="Removing various files..." --weight=1 + +# Remove the log files +ynh_secure_remove --file="/var/log/$app" + #================================================= # GENERIC FINALIZATION #================================================= From fd4ccc60dad6fe4421a4f2f9397de85005dbcd4a Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 9 Nov 2021 00:01:50 +0100 Subject: [PATCH 3/4] Bump package version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 58e2df5..69c491f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "ZeroTier network controller user interface", "fr": "Interface utilisateur pour le contrôleur de réseau ZeroTier" }, - "version": "20210310~ynh2", + "version": "20210310~ynh3", "url": "https://key-networks.com/ztncui", "upstream": { "license": "GPL-3.0-only", From fdec4e529efb158af3db0b97acb589412ddf9f6f Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 8 Nov 2021 23:02:05 +0000 Subject: [PATCH 4/4] 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 e80d7f0..58b5c24 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ It allows you to take control of your own ZeroTier network without relying on th -**Shipped version:** 20210310~ynh2 +**Shipped version:** 20210310~ynh3 diff --git a/README_fr.md b/README_fr.md index d2759fa..a650a7a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,7 +16,7 @@ It allows you to take control of your own ZeroTier network without relying on th -**Version incluse :** 20210310~ynh2 +**Version incluse :** 20210310~ynh3