From 428f0a61fc074a996c982c239d4c6a457076437d Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Sun, 19 Apr 2020 18:15:58 +0200
Subject: [PATCH] Wait for fail2ban to reload

---
 data/helpers.d/fail2ban | 2 +-
 data/helpers.d/systemd  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/helpers.d/fail2ban b/data/helpers.d/fail2ban
index 58af9ec0b..40f435ecd 100644
--- a/data/helpers.d/fail2ban
+++ b/data/helpers.d/fail2ban
@@ -130,7 +130,7 @@ EOF
   ynh_store_file_checksum "$finalfail2banjailconf"
   ynh_store_file_checksum "$finalfail2banfilterconf"
 
-  ynh_systemd_action --service_name=fail2ban --action=reload
+  ynh_systemd_action --service_name=fail2ban --action=reload --line_match="(Started|Reloaded) Fail2Ban Service" --log_path=systemd
 
   local fail2ban_error="$(journalctl -u fail2ban | tail -n50 | grep "WARNING.*$app.*")"
   if [[ -n "$fail2ban_error" ]]; then
diff --git a/data/helpers.d/systemd b/data/helpers.d/systemd
index 960382f8f..2c290ad64 100644
--- a/data/helpers.d/systemd
+++ b/data/helpers.d/systemd
@@ -133,7 +133,7 @@ ynh_systemd_action() {
         for i in $(seq 1 $timeout)
         do
             # Read the log until the sentence is found, that means the app finished to start. Or run until the timeout
-            if grep --quiet "$line_match" "$templog"
+            if grep --extended-regexp --quiet "$line_match" "$templog"
             then
                 ynh_print_info --message="The service $service_name has correctly started."
                 break