From 43be545bb46ac3333b35c4d732efd4cc200092ba Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 8 Jun 2024 08:31:35 +0200 Subject: [PATCH] Update upgrade --- scripts/upgrade | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 282a0dd..69e8154 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -42,11 +42,11 @@ ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= ynh_script_progression --message="Updating a configuration file..." -ynh_add_config --template="../conf/development.ini.sample" --destination="$install_dir/backend/development.ini" +ynh_add_config --template="development.ini.sample" --destination="$install_dir/backend/development.ini" chmod 400 "$install_dir/backend/development.ini" chown $app:$app "$install_dir/backend/development.ini" -ynh_add_config --template="../conf/configEnv.json.sample" --destination="$install_dir/frontend/configEnv.json" +ynh_add_config --template="configEnv.json.sample" --destination="$install_dir/frontend/configEnv.json" chmod 400 "$install_dir/frontend/configEnv.json" chown $app:$app "$install_dir/frontend/configEnv.json" @@ -73,9 +73,12 @@ pushd "$install_dir/backend" ynh_exec_warn_less ./update_i18n_json_file.sh || exit 1 popd -pushd "$install_dir" - ynh_exec_warn_less yarn install - ynh_exec_warn_less ./build_full_frontend.sh +pushd $install_dir + ynh_use_nodejs + echo 'nodeLinker: node-modules' >> .yarnrc.yml + 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 COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm install + ynh_exec_warn_less env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 ./build_full_frontend.sh popd chmod 750 "$install_dir" @@ -90,17 +93,17 @@ ynh_script_progression --message="Upgrading systemd configuration..." # Create a dedicated systemd config ynh_add_supervisor_config --service="$app" --template="supervisord.conf" -ynh_add_config --template="../conf/web.ini" --destination="/etc/uwsgi/apps-available/$app-web.ini" +ynh_add_config --template="web.ini" --destination="/etc/uwsgi/apps-available/$app-web.ini" chmod 400 "/etc/uwsgi/apps-available/$app-web.ini" chown $app:$app "/etc/uwsgi/apps-available/$app-web.ini" ln -sf /etc/uwsgi/apps-available/$app-web.ini /etc/uwsgi/apps-enabled/$app-web.ini -ynh_add_config --template="../conf/webdav.ini" --destination="/etc/uwsgi/apps-available/$app-webdav.ini" +ynh_add_config --template="webdav.ini" --destination="/etc/uwsgi/apps-available/$app-webdav.ini" chmod 400 "/etc/uwsgi/apps-available/$app-webdav.ini" chown $app:$app "/etc/uwsgi/apps-available/$app-webdav.ini" ln -sf /etc/uwsgi/apps-available/$app-webdav.ini /etc/uwsgi/apps-enabled/$app-webdav.ini -ynh_add_config --template="../conf/caldav.ini" --destination="/etc/uwsgi/apps-available/$app-caldav.ini" +ynh_add_config --template="caldav.ini" --destination="/etc/uwsgi/apps-available/$app-caldav.ini" chmod 400 "/etc/uwsgi/apps-available/$app-caldav.ini" chown $app:$app "/etc/uwsgi/apps-available/$app-caldav.ini" ln -sf /etc/uwsgi/apps-available/$app-caldav.ini /etc/uwsgi/apps-enabled/$app-caldav.ini