From 63d3ac99ca34a54a0c051a3eb3c382c1f13b2351 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sat, 3 Apr 2021 22:22:02 +0200
Subject: [PATCH] Fix package_check test

---
 scripts/install | 6 +++---
 scripts/restore | 6 +++---
 scripts/upgrade | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/install b/scripts/install
index c3f9e72..14e5238 100644
--- a/scripts/install
+++ b/scripts/install
@@ -212,9 +212,6 @@ ynh_script_progression --message="Starting a systemd service..."
 ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" --line_match="Running with the following plugins enabled"
 ynh_systemd_action --service_name="${app}-server" --action="start" --log_path="systemd" --line_match="Application startup complete"
 ynh_systemd_action --service_name="${app}-worker" --action="start" --log_path="systemd" --line_match="Running with the following plugins enabled"
-if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
-	sleep 60
-fi
 
 #=================================================
 # SETUP FAIL2BAN
@@ -243,6 +240,9 @@ fi
 ynh_script_progression --message="Reloading NGINX web server..."
 
 ynh_systemd_action --service_name=nginx --action=reload
+if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
+	sleep 60
+fi
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/restore b/scripts/restore
index f9aa444..c38eaf2 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -144,9 +144,6 @@ ynh_script_progression --message="Starting a systemd service..."
 ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" --line_match="Running with the following plugins enabled"
 ynh_systemd_action --service_name="${app}-server" --action="start" --log_path="systemd" --line_match="Application startup complete"
 ynh_systemd_action --service_name="${app}-worker" --action="start" --log_path="systemd" --line_match="Running with the following plugins enabled"
-if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
-	sleep 60
-fi
 
 #=================================================
 # GENERIC FINALIZATION
@@ -156,6 +153,9 @@ fi
 ynh_script_progression --message="Reloading NGINX web server..."
 
 ynh_systemd_action --service_name=nginx --action=reload
+if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
+	sleep 60
+fi
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/upgrade b/scripts/upgrade
index 545a26c..6762b9c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -241,9 +241,6 @@ ynh_script_progression --message="Starting a systemd service..."
 ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" --line_match="Running with the following plugins enabled"
 ynh_systemd_action --service_name="${app}-server" --action="start" --log_path="systemd" --line_match="Application startup complete"
 ynh_systemd_action --service_name="${app}-worker" --action="start" --log_path="systemd" --line_match="Running with the following plugins enabled"
-if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
-	sleep 60
-fi
 
 #=================================================
 # UPGRADE FAIL2BAN
@@ -259,6 +256,9 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-access.log" --failrege
 ynh_script_progression --message="Reloading NGINX web server..."
 
 ynh_systemd_action --service_name=nginx --action=reload
+if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
+	sleep 60
+fi
 
 #=================================================
 # END OF SCRIPT