From 81f809068178fbf150f364dc9b8028fd94ca9576 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 14 Mar 2021 19:22:51 +0100 Subject: [PATCH 1/2] Remove is_public --- check_process | 1 - manifest.json | 2 +- scripts/install | 1 - scripts/upgrade | 9 --------- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/check_process b/check_process index 82e4a88..f98e910 100644 --- a/check_process +++ b/check_process @@ -14,7 +14,6 @@ upgrade=1 from_commit=9e5c65c461a22d9b85be732e072ff938911106ad backup_restore=1 multi_instance=1 - port_already_use=0 change_url=1 ;;; Options Email=maniackc_dev@crudelis.fr diff --git a/manifest.json b/manifest.json index b7e252e..6355ec0 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.1.7" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index b8162ba..4c269f8 100644 --- a/scripts/install +++ b/scripts/install @@ -48,7 +48,6 @@ ynh_script_progression --message="Storing installation settings..." ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=is_public --value=$is_public ynh_app_setting_set --app=$app --key=final_path --value=$final_path #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index e135d5d..8e62337 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -17,7 +17,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get $app domain) path_url=$(ynh_app_setting_get $app path) -is_public=$(ynh_app_setting_get $app is_public) final_path=$(ynh_app_setting_get $app final_path) #================================================= @@ -30,14 +29,6 @@ upgrade_type=$(ynh_check_app_version_changed) # ENSURE DOWNWARD COMPATIBILITY #================================================= -if [ "$is_public" = "Yes" ]; then - ynh_app_setting_set $app is_public 1 # Fixe is_public en booléen - is_public=1 -elif [ "$is_public" = "No" ]; then - ynh_app_setting_set $app is_public 0 - is_public=0 -fi - if [ -z "$final_path" ]; then final_path=/var/www/$app ynh_app_setting_set $app final_path $final_path From e7e640a0eb080e696729654d10e03d3caaaa86f8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 14 Mar 2021 21:45:45 +0100 Subject: [PATCH 2/2] Update check_process --- check_process | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/check_process b/check_process index f98e910..ac3537a 100644 --- a/check_process +++ b/check_process @@ -11,14 +11,14 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=9e5c65c461a22d9b85be732e072ff938911106ad + upgrade=1 from_commit=6ec03114172c5de3291059756a38d57c63ffb4f2 backup_restore=1 multi_instance=1 change_url=1 ;;; Options -Email=maniackc_dev@crudelis.fr +Email= Notification=down ;;; Upgrade options - ; commit=9e5c65c461a22d9b85be732e072ff938911106ad - name=6 Dec 2016 9e5c65c461a22d9b85be732e072ff938911106ad + ; commit=6ec03114172c5de3291059756a38d57c63ffb4f2 + name=Merge pull request #17 from YunoHost-Apps/testing manifest_arg=domain=DOMAIN&path=PATH&is_public=1