mirror of
https://github.com/nextcloud/all-in-one.git
synced 2024-09-20 23:06:10 +08:00
Revert "fix Clamav starting trap"
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
parent
c16d59f9e4
commit
3f775653a0
|
@ -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
|
||||
|
|
|
@ -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 %}
|
||||
<script type="text/javascript" src="automatic_reload.js"></script>
|
||||
{% else %}
|
||||
<script type="text/javascript" src="before-unload.js"></script>
|
||||
|
|
Loading…
Reference in a new issue