eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-02-17 03:00:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #1540 from nextcloud/enh/noid/revert-clamav-trap

Browse source 
Revert "fix Clamav starting trap"
This commit is contained in:
Simon L 2022-12-17 15:34:23 +01:00 • committed by GitHub
commit 083150bfb3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Containers/nextcloud/entrypoint.sh
View file

@ -472,16 +472,10 @@ fi
# Clamav # Clamav
if [ "$CLAMAV_ENABLED" = 'yes' ]; then if [ "$CLAMAV_ENABLED" = 'yes' ]; then
CLAMAV_COUNT=0 while ! nc -z "$CLAMAV_HOST" 3310; do
while ! nc -z "$CLAMAV_HOST" 3310 && [ "$CLAMAV_COUNT" -lt 90 ]; do
echo "waiting for clamav to become available..." echo "waiting for clamav to become available..."
CLAMAV_COUNT=$((CLAMAV_COUNT + 5))
sleep 5 sleep 5
done 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 if ! [ -d "/var/www/html/custom_apps/files_antivirus" ]; then
php /var/www/html/occ app:install files_antivirus php /var/www/html/occ app:install files_antivirus
elif [ "$(php /var/www/html/occ config:app:get files_antivirus enabled)" = "no" ]; then elif [ "$(php /var/www/html/occ config:app:get files_antivirus enabled)" = "no" ]; then

2
php/templates/containers.twig
View file

@ -565,7 +565,7 @@
{% endif %} {% endif %}
{% 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> <script type="text/javascript" src="automatic_reload.js"></script>
{% else %} {% else %}
<script type="text/javascript" src="before-unload.js"></script> <script type="text/javascript" src="before-unload.js"></script>