From 3f775653a017b289ccd1cedbdc56053ec6b7f019 Mon Sep 17 00:00:00 2001 From: Simon L Date: Sat, 17 Dec 2022 15:30:45 +0100 Subject: [PATCH] Revert "fix Clamav starting trap" Signed-off-by: Simon L --- Containers/nextcloud/entrypoint.sh | 8 +------- php/templates/containers.twig | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Containers/nextcloud/entrypoint.sh b/Containers/nextcloud/entrypoint.sh index 81d0c697..aa3fea26 100644 --- a/Containers/nextcloud/entrypoint.sh +++ b/Containers/nextcloud/entrypoint.sh @@ -472,16 +472,10 @@ fi # Clamav if [ "$CLAMAV_ENABLED" = 'yes' ]; then - CLAMAV_COUNT=0 - while ! nc -z "$CLAMAV_HOST" 3310 && [ "$CLAMAV_COUNT" -lt 90 ]; do + while ! nc -z "$CLAMAV_HOST" 3310; do echo "waiting for clamav to become available..." - CLAMAV_COUNT=$((CLAMAV_COUNT + 5)) sleep 5 done - if [ "$CLAMAV_COUNT" -ge 90 ]; then - echo "Error: ClamAV was not reachable within 90s. Most likely is your RAM not big enough to let it start correctly." - exit 1 - fi if ! [ -d "/var/www/html/custom_apps/files_antivirus" ]; then php /var/www/html/occ app:install files_antivirus elif [ "$(php /var/www/html/occ config:app:get files_antivirus enabled)" = "no" ]; then diff --git a/php/templates/containers.twig b/php/templates/containers.twig index e41d0fcb..fa2f303d 100644 --- a/php/templates/containers.twig +++ b/php/templates/containers.twig @@ -565,7 +565,7 @@ {% endif %} {% endif %} - {% if isAnyRestarting == false and (isApacheStarting == true or is_backup_container_running == true or isWatchtowerRunning == true or is_daily_backup_running == true) %} + {% if isApacheStarting == true or is_backup_container_running == true or isWatchtowerRunning == true or is_daily_backup_running == true %} {% else %}