github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-22 06:14:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid clamav fixes if clamav is disabled

Browse source
This commit is contained in:
myvesta 2021-11-14 20:01:21 +01:00 • committed by GitHub
commit d9202d91b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 61 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/deb/vesta/postinst
View file

@ -141,6 +141,8 @@ if [ "$check_cron" -eq 0 ]; then
crontab -l | { cat; echo "10 2 * * 6 sudo find /home/*/tmp/ -type f -mtime +5 -exec rm {} \;"; } | crontab - crontab -l | { cat; echo "10 2 * * 6 sudo find /home/*/tmp/ -type f -mtime +5 -exec rm {} \;"; } | crontab -
fi fi
unit_files="$(systemctl list-unit-files | grep clamav-daemon)"
if [[ ! "$unit_files" =~ "disabled" ]]; then
# make sure clamav-daemon.service has mkdir fix # make sure clamav-daemon.service has mkdir fix
if [ -f "/lib/systemd/system/clamav-daemon.service" ]; then if [ -f "/lib/systemd/system/clamav-daemon.service" ]; then
check_grep=$(grep -c 'mkdir' /lib/systemd/system/clamav-daemon.service) check_grep=$(grep -c 'mkdir' /lib/systemd/system/clamav-daemon.service)
@ -187,23 +189,6 @@ if [ ! -f "/usr/local/vesta/data/upgrades/change-clamav-socket-v4" ]; then
fi fi
fi fi
# Making sure mpm_event will stay
if [ ! -f "/usr/local/vesta/data/upgrades/keeping-mpm-event-2" ]; then
touch /usr/local/vesta/data/upgrades/keeping-mpm-event-2
echo "=== scheduling keeping-mpm-event check script"
echo "bash /usr/local/vesta/upd/keep_mpm_event.sh 'background' >> /usr/local/vesta/data/upgrades/keeping-mpm-event.log 2>&1" >> /usr/local/vesta/data/queue/restart.pipe
/usr/local/vesta/bin/v-add-cron-restart-job > /dev/null 2>&1
fi
# Fixing ssl directive in nginx templates
if [ "$release" -eq 9 ] || [ "$release" -eq 10 ]; then
if [ ! -f "/usr/local/vesta/data/upgrades/fix_ssl_directive_in_templates" ]; then
touch /usr/local/vesta/data/upgrades/fix_ssl_directive_in_templates
echo "=== Fixing ssl directive in nginx templates"
bash /usr/local/vesta/upd/fix_ssl_directive_in_templates.sh
fi
fi
# Block executable files inside zip/rar/tar archives in ClamAV # Block executable files inside zip/rar/tar archives in ClamAV
if [ ! -f "/usr/local/vesta/data/upgrades/clamav_block_exe_in_archives" ]; then if [ ! -f "/usr/local/vesta/data/upgrades/clamav_block_exe_in_archives" ]; then
touch /usr/local/vesta/data/upgrades/clamav_block_exe_in_archives touch /usr/local/vesta/data/upgrades/clamav_block_exe_in_archives
@ -220,6 +205,24 @@ if [ ! -f "/usr/local/vesta/data/upgrades/clamav_block_exe_in_archives" ]; then
fi fi
fi fi
fi fi
fi
# Making sure mpm_event will stay
if [ ! -f "/usr/local/vesta/data/upgrades/keeping-mpm-event-2" ]; then
touch /usr/local/vesta/data/upgrades/keeping-mpm-event-2
echo "=== scheduling keeping-mpm-event check script"
echo "bash /usr/local/vesta/upd/keep_mpm_event.sh 'background' >> /usr/local/vesta/data/upgrades/keeping-mpm-event.log 2>&1" >> /usr/local/vesta/data/queue/restart.pipe
/usr/local/vesta/bin/v-add-cron-restart-job > /dev/null 2>&1
fi
# Fixing ssl directive in nginx templates
if [ "$release" -eq 9 ] || [ "$release" -eq 10 ]; then
if [ ! -f "/usr/local/vesta/data/upgrades/fix_ssl_directive_in_templates" ]; then
touch /usr/local/vesta/data/upgrades/fix_ssl_directive_in_templates
echo "=== Fixing ssl directive in nginx templates"
bash /usr/local/vesta/upd/fix_ssl_directive_in_templates.sh
fi
fi
# Clearing letsencrypt pipe # Clearing letsencrypt pipe
if [ ! -f "/usr/local/vesta/data/upgrades/clearing-letsencrypt-pipe" ]; then if [ ! -f "/usr/local/vesta/data/upgrades/clearing-letsencrypt-pipe" ]; then