diff --git a/CHANGELOG.md b/CHANGELOG.md index 17828f75..7b4a28c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,7 +48,7 @@ The **patch** part changes incrementally at each release. * apt: hold packages only if package is installed * certbot: commit hook must be executed at the end * elasticsearch: listen on local interface only by default -* evocheck: upstream version 19.11.2 +* evocheck: upstream verison 20.02.1 * evocheck: cron jobs execute in verbose * evolinux-base: use "evolinux_internal_group" for SSH authentication * evomaintenance: Turn on API by default (instead of DB) diff --git a/evocheck/files/evocheck.sh b/evocheck/files/evocheck.sh index b351081d..93c5a8d4 100644 --- a/evocheck/files/evocheck.sh +++ b/evocheck/files/evocheck.sh @@ -659,11 +659,7 @@ check_muninrunning() { } # Check if files in /home/backup/ are up-to-date check_backupuptodate() { - # find local backup directory - backup_dir=$(grep --no-messages 'LOCAL_BACKUP_DIR=' /etc/cron.daily/zzz_evobackup | tr -d \" | cut -d= -f2) - if [ -z "${backup_dir}" ]; then - backup_dir="/home/backup" - fi + backup_dir="/home/backup" if [ -d "${backup_dir}" ]; then if [ -n "$(ls -A ${backup_dir})" ]; then for file in ${backup_dir}/*; do @@ -758,7 +754,7 @@ check_tune2fs_m5() { check_evolinuxsudogroup() { if is_debian_stretch || is_debian_buster; then if grep -q "^evolinux-sudo:" /etc/group; then - grep -q '^%evolinux-sudo ALL=(ALL:ALL) ALL' /etc/sudoers.d/evolinux \ + grep -qE '^%evolinux-sudo +ALL ?= ?\(ALL:ALL\) ALL' /etc/sudoers.d/evolinux \ || failed "IS_EVOLINUXSUDOGROUP" "missing evolinux-sudo directive in sudoers file" fi fi @@ -1464,7 +1460,7 @@ readonly PROGDIR=$(realpath -m "$(dirname "$0")") # shellcheck disable=2124 readonly ARGS=$@ -readonly VERSION="19.11.2" +readonly VERSION="20.02.1" # Disable LANG* export LANG=C