fix race condition (#1771)

1 files changed, 23 insertions, 15 deletions

diff --git a/apps/fail2ban.sh b/apps/fail2ban.sh
index f6b87cbe..83c96fe2 100644
--- a/apps/fail2ban.sh
+++ b/apps/fail2ban.sh
@@ -57,6 +57,24 @@ fi
 # Create $VMLOGS dir
 mkdir -p "$VMLOGS"
 
+find_log() {
+    NCLOG=$(find / -type f -name "nextcloud.log" 2> /dev/null)
+    if [ "$NCLOG" != "$VMLOGS/nextcloud.log" ]
+    then
+        # Might enter here if no OR multiple logs already exist, tidy up any existing logs and set the correct path
+        print_text_in_color "$ICyan" "Unexpected or non-existent logging configuration - \
+deleting any discovered nextcloud.log files and creating a new one at $VMLOGS/nextcloud.log..."
+        xargs rm -f <<< "$NCLOG"
+        # Set logging
+        nextcloud_occ config:system:set log_type --value=file
+        nextcloud_occ config:system:set logfile --value="$VMLOGS/nextcloud.log"
+        nextcloud_occ config:system:set loglevel --value=2
+        touch "$VMLOGS/nextcloud.log"
+        chown www-data:www-data "$VMLOGS/nextcloud.log"
+        return
+    fi
+}
+
 ### Local variables ###
 # location of Nextcloud logs
 print_text_in_color "$ICyan" "Finding nextcloud.log..."
@@ -70,6 +88,8 @@ do
             nextcloud_occ config:system:set log_type --value=file
             nextcloud_occ config:system:set loglevel --value=2
             break
+        else
+           find_log
         fi
     elif [ -n "$(nextcloud_occ_no_check config:system:get logfile)" ]
     then
@@ -81,25 +101,13 @@ do
         chown www-data:www-data "$VMLOGS/nextcloud.log"
         break
     else
-        NCLOG=$(find / -type f -name "nextcloud.log" 2> /dev/null)
-        if [ "$NCLOG" != "$VMLOGS/nextcloud.log" ]
-        then
-            # Might enter here if no OR multiple logs already exist, tidy up any existing logs and set the correct path
-            print_text_in_color "$ICyan" "Unexpected or non-existent logging configuration - \
-deleting any discovered nextcloud.log files and creating a new one at $VMLOGS/nextcloud.log..."
-            xargs rm -f <<< "$NCLOG"
-            # Set logging
-            nextcloud_occ config:system:set log_type --value=file
-            nextcloud_occ config:system:set logfile --value="$VMLOGS/nextcloud.log"
-            nextcloud_occ config:system:set loglevel --value=2
-            touch "$VMLOGS/nextcloud.log"
-            chown www-data:www-data "$VMLOGS/nextcloud.log"
-            break
-        fi
+        find_log
     fi
 done
+
 # remove ncdata, else it will be used
 rm -f $NCDATA/nextcloud.log
+
 # time to ban an IP that exceeded attempts
 BANTIME_=1209600
 # cooldown time for incorrect passwords