From 2be21892a9b479710405a6ecd74ffb0541e0d202 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Wed, 3 Nov 2021 18:47:15 +0100 Subject: [PATCH] simplify Temporarily enable visitors for curl if needed --- scripts/upgrade | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3525ba7..c73a7b2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -111,13 +111,13 @@ then visitors_enabled=$(ynh_permission_has_user "main" "visitors" && echo yes || echo no) if [[ $visitors_enabled == "no" ]]; then ynh_permission_update --permission "main" --add "visitors" - fi + fi # Finalize the upgrade ynh_local_curl "/index.php" sleep 5 ynh_local_curl "/index.php" - + if [[ $visitors_enabled == "no" ]]; then ynh_permission_update --permission "main" --remove "visitors" fi @@ -154,26 +154,19 @@ then chown -R $app:$app $final_path chmod 755 $final_path - # Create the visitors permission if needed - visitors_enabled=$(ynh_permission_has_user "main" "visitors" && echo 0 || echo 1) - if [[ $visitors_enabled -eq 1 ]]; then + # Temporarily enable visitors for curl if needed + visitors_enabled=$(ynh_permission_has_user "main" "visitors" && echo yes || echo no) + if [[ $visitors_enabled == "no" ]]; then ynh_permission_update --permission "main" --add "visitors" - ynh_systemd_action --service_name=nginx --action=reload - # Finalize the upgrade - ynh_local_curl "/index.php" - sleep 5 - ynh_local_curl "/index.php" - upgrade_type="UPGRADE_APP" - ynh_permission_update --permission "main" --remove "visitors" fi - if [[ $visitors_enabled -eq 0 ]]; then - ynh_systemd_action --service_name=nginx --action=reload - # Finalize the upgrade - ynh_local_curl "/index.php" - sleep 5 - ynh_local_curl "/index.php" - upgrade_type="UPGRADE_APP" + # Finalize the upgrade + ynh_local_curl "/index.php" + sleep 5 + ynh_local_curl "/index.php" + + if [[ $visitors_enabled == "no" ]]; then + ynh_permission_update --permission "main" --remove "visitors" fi fi