From 5c5eaa3d3ca75be710fec3c18d189ad6e25b1afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Sun, 1 Sep 2024 10:47:55 +0200 Subject: [PATCH 1/2] yunohost changed the way to call node --- conf/systemd.service | 2 +- scripts/install | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 5c999ff..0d72488 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -8,7 +8,7 @@ User=__APP__ Group=__APP__ EnvironmentFile=__INSTALL_DIR__/.env WorkingDirectory=__INSTALL_DIR__/package/ -ExecStart=__YNH_NODE__ ./src/server.js +ExecStart=__NODEJS_DIR__/node ./src/server.js StandardOutput=append:/var/log/__APP__/__APP__.log StandardError=inherit diff --git a/scripts/install b/scripts/install index 4b2a18b..231276e 100755 --- a/scripts/install +++ b/scripts/install @@ -53,7 +53,7 @@ if [ $install_chromium -eq 1 ]; then ynh_script_progression --message="Installing Chromium..." --weight=8 pushd "$install_dir/package" - ynh_exec_as "$app" $ynh_node_load_PATH $ynh_node "./node_modules/puppeteer/install.js" + ynh_exec_as "$app" $ynh_nodejs_dir/node "./node_modules/puppeteer/install.js" popd fi diff --git a/scripts/upgrade b/scripts/upgrade index b8a19ff..c2c4614 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -81,7 +81,7 @@ if [ "$install_chromium" -eq 1 ]; then ynh_secure_remove --file="$install_dir/.cache/puppeteer/chrome" pushd "$install_dir/package" - ynh_exec_as "$app" $ynh_node_load_PATH $ynh_node "./node_modules/puppeteer/install.js" + ynh_exec_as "$app" $nodejs_dir/node "./node_modules/puppeteer/install.js" popd fi From ef8f210f8c44eed8ebd052d1352e40200effb8bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Sun, 1 Sep 2024 11:35:36 +0200 Subject: [PATCH 2/2] Enforce helpers 2.1 --- manifest.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index ada831c..ffe8aa2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,7 +16,8 @@ license = "MIT" code = "https://github.com/gcollin/cookie-aware-cors-proxy" [integration] -yunohost = ">= 11.1.9" +yunohost = ">= 11.2.18" +helpers_version = "2.1" architectures = ["amd64"] multi_instance = false ldap = "not_relevant"