From 67f4bd22eed4c7b3a59a75a22baa1602bd7e2b5e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 12 Dec 2022 22:11:47 +0100 Subject: [PATCH 1/4] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 9363136..82b9c4f 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "plateau", "packaging_format": 1, "description": { - "en": "Plateau helps designers organize and document participatory workshops.", - "fr": "Plateau aide les designers a organiser et documenter des ateliers participatifs." + "en": "Documentation tool for projects and workshops", + "fr": "Outil de documentation pour les projets et workshops participatifs" }, "version": "1.0~ynh1", "url": "https://plateau.latelier-des-chercheurs.fr/", From 210e11aa66fd964e58fb38ace493ee587b3f4248 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 12 Dec 2022 22:20:21 +0100 Subject: [PATCH 2/4] remove unused variables --- scripts/backup | 7 ------- scripts/change_url | 5 ----- scripts/restore | 3 --- scripts/upgrade | 3 --- 4 files changed, 18 deletions(-) diff --git a/scripts/backup b/scripts/backup index a57334a..68a2a5f 100755 --- a/scripts/backup +++ b/scripts/backup @@ -30,8 +30,6 @@ app=$YNH_APP_INSTANCE_NAME final_path=$(ynh_app_setting_get --app=$app --key=final_path) domain=$(ynh_app_setting_get --app=$app --key=domain) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= @@ -39,11 +37,6 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= ynh_print_info --message="Declaring files to be backed up..." -### N.B. : the following 'ynh_backup' calls are only a *declaration* of what needs -### to be backuped and not an actual copy of any file. The actual backup that -### creates and fill the archive with the files happens in the core after this -### script is called. Hence ynh_backups calls takes basically 0 seconds to run. - #================================================= # BACKUP THE APP MAIN DIR #================================================= diff --git a/scripts/change_url b/scripts/change_url index 7aca5d8..ad08adb 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -29,11 +29,6 @@ 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) -# Add settings here as needed by your application -#db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#db_user=$db_name -#db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) - #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= diff --git a/scripts/restore b/scripts/restore index d7a3477..9b2f80a 100755 --- a/scripts/restore +++ b/scripts/restore @@ -31,9 +31,6 @@ 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) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 8b1bb9c..fce9264 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,10 +18,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) -language=$(ynh_app_setting_get --app=$app --key=language) -admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) #================================================= # CHECK VERSION From 51085939a2c891519dcb685177965e71f96f1106 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 12 Dec 2022 22:21:06 +0100 Subject: [PATCH 3/4] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index f41c4c9..2bffd5c 100644 --- a/check_process +++ b/check_process @@ -20,7 +20,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=CommitHash + #upgrade=1 from_commit=CommitHash backup_restore=1 multi_instance=1 port_already_use=0 From 8fd111cbbb8ce644ce914fa25da75750ba1b1d32 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 12 Dec 2022 22:21:28 +0100 Subject: [PATCH 4/4] Update upgrade --- scripts/upgrade | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index fce9264..8dcc5d2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -128,15 +128,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -ynh_script_progression --message="Finding an available port..." - -#================================================= -# FIND AND OPEN A PORT -#================================================= -# Find an available port -port=$(ynh_find_port --port=8080) -ynh_app_setting_set --app=$app --key=port --value=$port - #================================================= # NGINX CONFIGURATION #=================================================