From fcaf3430d45cc7aa61e2874c6ba0c958577b42a2 Mon Sep 17 00:00:00 2001 From: guillaume bouzige Date: Tue, 13 Dec 2022 11:21:37 +0100 Subject: [PATCH 1/7] fix upgrade multi-instance --- check_process | 2 +- scripts/upgrade | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/check_process b/check_process index 2bffd5c..b287317 100644 --- a/check_process +++ b/check_process @@ -22,7 +22,7 @@ upgrade=1 #upgrade=1 from_commit=CommitHash backup_restore=1 - multi_instance=1 + multi_instance=0 port_already_use=0 change_url=1 ;;; Options diff --git a/scripts/upgrade b/scripts/upgrade index fdc852a..75a1ccd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -88,16 +88,6 @@ if ynh_legacy_permissions_exists; then ynh_app_setting_delete --app=$app --key=is_public fi -if ! ynh_permission_exists --permission="admin"; then - # Create the required permissions - ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin -fi - -# Create a permission if needed -if ! ynh_permission_exists --permission="api"; then - ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true" -fi - #================================================= # CREATE DEDICATED USER #================================================= From f576869c21ed7d93005a5538cd8d0311bb78ee74 Mon Sep 17 00:00:00 2001 From: guillaume bouzige Date: Tue, 13 Dec 2022 11:23:35 +0100 Subject: [PATCH 2/7] add port var for nginx config --- scripts/change_url | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/change_url b/scripts/change_url index ad08adb..b05f628 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -28,6 +28,7 @@ ynh_script_progression --message="Loading installation settings..." # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) +path_url=$(ynh_app_setting_get --app=$port --key=port) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP From d5e52d4a4913ff304ecbe7309af230585c36bd77 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Thu, 15 Dec 2022 13:14:31 +0000 Subject: [PATCH 3/7] Update change_url --- scripts/change_url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/change_url b/scripts/change_url index b05f628..7d05853 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -28,7 +28,7 @@ ynh_script_progression --message="Loading installation settings..." # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) -path_url=$(ynh_app_setting_get --app=$port --key=port) +port=$(ynh_app_setting_get --app=$port --key=port) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP From fa9bba81771c676dd3ecebe6c46892c125cf0d00 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Thu, 15 Dec 2022 13:14:45 +0000 Subject: [PATCH 4/7] Update upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 75a1ccd..55dfc94 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,6 +19,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) +port=$(ynh_app_setting_get --app=$port --key=port) #================================================= # CHECK VERSION From e43caa75d72478c5b4b5a7dd8d4e44e7263e2b90 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Thu, 15 Dec 2022 13:26:15 +0000 Subject: [PATCH 5/7] Update restore fix missing nodejs --- scripts/restore | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/scripts/restore b/scripts/restore index 9b2f80a..da07214 100755 --- a/scripts/restore +++ b/scripts/restore @@ -43,6 +43,13 @@ test ! -d $final_path \ #================================================= # STANDARD RESTORATION STEPS +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the NGINX web server configuration..." + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -90,13 +97,14 @@ chown -R $app:www-data "$datadir" #================================================= # SPECIFIC RESTORATION #================================================= - #================================================= -# RESTORE THE NGINX CONFIGURATION +# REINSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." +ynh_script_progression --message="Reinstalling dependencies..." --weight=7 -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +# Define and install dependencies +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version +ynh_use_nodejs #================================================= # RESTORE VARIOUS FILES @@ -104,6 +112,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_script_progression --message="Restoring various files..." ynh_add_config --template="../conf/settings_base.json" --destination="$final_path/settings_base.json" +chmod 600 "$final_path/settings_base.json" #================================================= # RESTORE SYSTEMD From 212e172653ffa626e0e17a25e2dcb26a67a160f5 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Thu, 15 Dec 2022 16:22:16 +0000 Subject: [PATCH 6/7] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 9f36da4..d5eef02 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Helps designers organize and document participatory workshops.", "fr": "Aide les designers a organiser et documenter des ateliers participatifs." }, - "version": "1.0~ynh1", + "version": "1.2.2~ynh1", "url": "https://plateau.latelier-des-chercheurs.fr/", "upstream": { "license": "AGPL-3.0-or-later", From 2a79dc97a1b1ef20eb6fc09ac9113bc45af3dcde Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Thu, 15 Dec 2022 16:24:01 +0000 Subject: [PATCH 7/7] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index d5eef02..be46e07 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Helps designers organize and document participatory workshops.", "fr": "Aide les designers a organiser et documenter des ateliers participatifs." }, - "version": "1.2.2~ynh1", + "version": "2.0.0b~ynh1", "url": "https://plateau.latelier-des-chercheurs.fr/", "upstream": { "license": "AGPL-3.0-or-later",