From e90db69db75c2d0877ef981102483103658b16c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Fri, 10 Apr 2020 11:56:07 +0200 Subject: [PATCH] Change permissions system. Bump Yunohost required version accordingly. --- scripts/install | 4 ++-- scripts/upgrade | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 029648e..91021c1 100644 --- a/scripts/install +++ b/scripts/install @@ -156,9 +156,9 @@ chmod 640 "$final_path/config/baikal.yaml" ynh_script_progression --message="Configuring SSOwat..." --weight=2 # Allow public access on / -ynh_app_setting_set --app=$app --key=skipped_uris --value="/" +ynh_permission_update --permission "main" --add "visitors" # But restrain on /admin -ynh_app_setting_set --app=$app --key=protected_uris --value="/admin/" +ynh_permission_create --permission "admin" --url "/admin" --allowed "all_users" #================================================= # RELOAD NGINX diff --git a/scripts/upgrade b/scripts/upgrade index 42c5cea..c5efe4f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -195,10 +195,16 @@ chmod 640 "$final_path/config/baikal.yaml" #================================================= ynh_script_progression --message="Configuring SSOwat..." --weight=2 -# Allow public access on / -ynh_app_setting_set --app=$app --key=skipped_uris --value="/" -# But restrain on /admin -ynh_app_setting_set --app=$app --key=protected_uris --value="/admin/" +# Upgrade from the legacy permissions system +protected_uris=$(ynh_app_setting_get --app="$app" --key=protected_uris) +if [ -n "${protected_uris}" ]; then + ynh_app_setting_delete --app="$app" --key=protected_uris + + # Allow public access on / + ynh_permission_update --permission "main" --add "visitors" + # But restrain on /admin + ynh_permission_create --permission "admin" --url "/admin" --allowed "all_users" +fi #================================================= # RELOAD NGINX