From 0d654c2e001a8c91f912f31e8652187fd35dada0 Mon Sep 17 00:00:00 2001 From: Aeris One Date: Mon, 30 Mar 2020 14:49:05 +0200 Subject: [PATCH] Quick and dirty workaround --- scripts/upgrade | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 53b9ae6..0f720b9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -48,11 +48,6 @@ skipped_uris=$(ynh_app_setting_get --app=$app --key=skipped_uris) unprotected_uris=$(ynh_app_setting_get --app=$app --key=unprotected_uris) protected_uris=$(ynh_app_setting_get --app=$app --key=protected_uris) -# Remove is_public if exists -if [ ! -z "$is_public" ]; then - ynh_app_setting_delete --app=$app --key=is_public -fi - # Remove skipped_uris if exists if [ ! -z "$skipped_uris" ]; then ynh_app_setting_delete --app=$app --key=skipped_uris @@ -68,6 +63,16 @@ if [ ! -z "$protected_uris" ]; then ynh_app_setting_delete --app=$app --key=protected_uris fi +# Remove is_public if exists +if [ ! -z $is_public ]; then + if [ "$is_public" = "1" ]; then + ynh_permission_update --permission "main" --add "visitors" + show_warning="1" + fi + ynh_app_setting_delete --app=$app --key=is_public +fi + + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -131,4 +136,10 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= +if [ ! -z $show_warning ]; then + if [ "$show_warning" = "1" ]; then + ynh_print_warn --message="Due to the fact that Yunohost resets permissions when upgrading a package from the old permissions system to the new one, we had to define your instance of Hextris as public. If you want to make it private, you can do it via webmin." + fi +fi + ynh_script_progression --message="Upgrade of $app completed" --last