From 0e61164948b11316d96401a52f7522f5c9184599 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 21 Mar 2021 09:19:14 +0100 Subject: [PATCH 1/3] Update install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index bea93a0..b3ae194 100644 --- a/scripts/install +++ b/scripts/install @@ -54,6 +54,7 @@ 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=max_file_size --value=$max_file_size ynh_app_setting_set --app=$app --key=secret --value=$secret From 57c3245a64c8308e2184cb46f3f878ba99fd32bc Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 21 Mar 2021 09:20:17 +0100 Subject: [PATCH 2/3] Update upgrade --- scripts/upgrade | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 64d2333..493011e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -57,12 +57,11 @@ if [ -z "$max_file_size" ]; then ynh_app_setting_set --app=$app --key=max_file_size --value=$max_file_size fi -# Make app public if necessary -if [ $is_public -eq 1 ] -then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. - ynh_permission_update --permission="main" --add="visitors" +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public fi #================================================= From 99cd96e7743df0f0d0d4ec975dc1376844496df8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 21 Mar 2021 09:21:20 +0100 Subject: [PATCH 3/3] Fix permissions --- scripts/change_url | 3 ++- scripts/upgrade | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index d228ada..a98a4f3 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -146,7 +146,8 @@ ynh_store_file_checksum --file="$config" #================================================= ynh_script_progression --message="Reconfigure SSOwat" -ynh_app_setting_set $app unprotected_uris "/" +ynh_permission_update --permission="main" --add="visitors" + if [ $is_public -eq 0 ] then if [ "$path_url" == "/" ]; then diff --git a/scripts/upgrade b/scripts/upgrade index 493011e..a47faf4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -199,9 +199,7 @@ popd #================================================= ynh_script_progression --message="Setuping cron..." -cp ../conf/cron_lufi /etc/cron.d/$app -ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path/" --target_file="/etc/cron.d/$app" -ynh_replace_string --match_string="__USER__" --replace_string="$app" --target_file="/etc/cron.d/$app" +ynh_add_config --template="../conf/cron_lufi" --destination="/etc/cron.d/$app" chmod +x $final_path/script/lufi #=================================================