diff --git a/manifest.json b/manifest.json index 5e3ec17..113cc2e 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "apps@yunohost.org" }, "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.1.0" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index ebffb0e..915612d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -386,3 +386,22 @@ ynh_multimedia_addaccess () { groupadd -f multimedia usermod -a -G multimedia $user_name } + +ynh_legacy_permissions_exists () { + for permission in "skipped" "unprotected" "protected" + do + if ynh_permission_exists --permission="legacy_${permission}_uris"; then + return 0 + fi + done + return 1 +} + +ynh_legacy_permissions_delete_all () { + for permission in "skipped" "unprotected" "protected" + do + if ynh_permission_exists --permission="legacy_${permission}_uris"; then + ynh_permission_delete --permission="legacy_${permission}_uris" + fi + done +} diff --git a/scripts/install b/scripts/install index cd9e1c7..f031147 100755 --- a/scripts/install +++ b/scripts/install @@ -340,8 +340,7 @@ ynh_add_fail2ban_config --logpath="/home/yunohost.app/$app/data/nextcloud.log" - #================================================= ynh_script_progression --message="Configuring SSOwat..." -ynh_app_setting_set --app=$app --key=skipped_regex \ - --value="$(sed 's/[\.\-]/\%&/g' <<< $domain)/%.well%-known/.*" +ynh_permission_create --permission="api" --url="re:$(sed 's/[\.\-]/\%&/g' <<< $domain)/%.well%-known/.*" #================================================= # RELOAD NGINX diff --git a/scripts/upgrade b/scripts/upgrade index 0c17cd3..f35d8c7 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -134,6 +134,12 @@ then ynh_replace_string "\('datadirectory' =>.*\)$old_app" "\1$app" "$final_path/config/config.php" fi +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_permission_create --permission="api" --label="api" --url="re:$(sed 's/[\.\-]/\%&/g' <<< $domain)/%.well%-known/.*" --allowed="visitors" "all_users" --auth_header="false" --show_tile="false" --protected="true" +fi + #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -476,14 +482,6 @@ ynh_add_fail2ban_config --logpath="/home/yunohost.app/$app/data/nextcloud.log" - #================================================= # GENERIC FINALIZATION -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=2 - -ynh_app_setting_set --app=$app --key=skipped_regex \ - --value="$(sed 's/[\.\-]/\%&/g' <<< $domain)/%.well%-known/.*" - #================================================= # RELOAD NGINX #=================================================