From 9e9aae305a91cdb02ff56b180e306b4a6088fe50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:45:22 +0200 Subject: [PATCH 1/4] cleaning --- manifest.toml | 2 +- scripts/install | 3 +-- scripts/upgrade | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 951e097..272813a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://etherpad.org/doc/v2.0.2/" code = "https://github.com/ether/etherpad-lite" [integration] -yunohost = ">= 11.2.12" +yunohost = ">= 11.2.14" architectures = "all" multi_instance = true diff --git a/scripts/install b/scripts/install index 62ec041..48f2a59 100644 --- a/scripts/install +++ b/scripts/install @@ -80,8 +80,7 @@ ynh_script_progression --message="Installing $app..." --weight=10 pushd $install_dir ynh_use_nodejs - ynh_exec_warn_less env $ynh_node_load_PATH corepack enable - ynh_exec_warn_less env $ynh_node_load_PATH corepack prepare pnpm@latest --activate + ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && corepack prepare COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm@latest --activate ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh popd diff --git a/scripts/upgrade b/scripts/upgrade index 0335593..49f5e62 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -101,8 +101,7 @@ ynh_script_progression --message="Installing $app..." --weight=10 pushd $install_dir ynh_use_nodejs - ynh_exec_warn_less env $ynh_node_load_PATH corepack enable - ynh_exec_warn_less env $ynh_node_load_PATH corepack prepare pnpm@latest --activate + ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && corepack prepare COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh popd From 959e85521f35d01aac4cbafdf236a3ef543c463c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 6 Jun 2024 14:04:15 +0200 Subject: [PATCH 2/4] fix --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 48f2a59..23d8d2f 100644 --- a/scripts/install +++ b/scripts/install @@ -80,7 +80,7 @@ ynh_script_progression --message="Installing $app..." --weight=10 pushd $install_dir ynh_use_nodejs - ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && corepack prepare COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm@latest --activate + ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh popd diff --git a/scripts/upgrade b/scripts/upgrade index 49f5e62..ec9e664 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -101,7 +101,7 @@ ynh_script_progression --message="Installing $app..." --weight=10 pushd $install_dir ynh_use_nodejs - ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && corepack prepare COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm@latest --activate + ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh popd From 4c650573767f3616be6b62b8788fbf84298087c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:43:47 +0200 Subject: [PATCH 3/4] Update restore --- scripts/restore | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/restore b/scripts/restore index 52de706..220299d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -32,9 +32,9 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=7 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version -pushd $install_dir - ynh_use_nodejs - ynh_exec_warn_less npm install pnpm -g +pushd "$install_dir" + ynh_use_nodejs + ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate popd #================================================= From cd1c7678b3fe9416d02976c0c0411788b760af66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:47:03 +0200 Subject: [PATCH 4/4] Update backup --- scripts/backup | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/scripts/backup b/scripts/backup index 312b053..e21c492 100644 --- a/scripts/backup +++ b/scripts/backup @@ -21,23 +21,13 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$install_dir" #================================================= -# BACKUP THE NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# SPECIFIC BACKUP -#================================================= -# BACKUP LOGROTATE -#================================================= - ynh_backup --src_path="/etc/logrotate.d/$app" -#================================================= -# BACKUP SYSTEMD -#================================================= - ynh_backup --src_path="/etc/systemd/system/$app.service" #=================================================