evolix
/
ansible-roles
22
2
Fork 2
Code Issues 61 Pull Requests 18 Releases 32 Wiki Activity

evocheck: upstream verison 20.02.1
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Jérémy Lecour 2020-02-27 11:37:01 +01:00 committed by Jérémy Lecour
parent 65bc2c657d
commit d31dddc9aa
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -48,7 +48,7 @@ The **patch** part changes incrementally at each release.
* apt: hold packages only if package is installed * apt: hold packages only if package is installed
* certbot: commit hook must be executed at the end * certbot: commit hook must be executed at the end
* elasticsearch: listen on local interface only by default * 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 * evocheck: cron jobs execute in verbose
* evolinux-base: use "evolinux_internal_group" for SSH authentication * evolinux-base: use "evolinux_internal_group" for SSH authentication
* evomaintenance: Turn on API by default (instead of DB) * evomaintenance: Turn on API by default (instead of DB)

10
evocheck/files/evocheck.sh
View File

@ -659,11 +659,7 @@ check_muninrunning() {
} }
# Check if files in /home/backup/ are up-to-date # Check if files in /home/backup/ are up-to-date
check_backupuptodate() { check_backupuptodate() {
# find local backup directory backup_dir="/home/backup"
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
if [ -d "${backup_dir}" ]; then if [ -d "${backup_dir}" ]; then
if [ -n "$(ls -A ${backup_dir})" ]; then if [ -n "$(ls -A ${backup_dir})" ]; then
for file in ${backup_dir}/*; do for file in ${backup_dir}/*; do
@ -758,7 +754,7 @@ check_tune2fs_m5() {
check_evolinuxsudogroup() { check_evolinuxsudogroup() {
if is_debian_stretch || is_debian_buster; then if is_debian_stretch || is_debian_buster; then
if grep -q "^evolinux-sudo:" /etc/group; 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" || failed "IS_EVOLINUXSUDOGROUP" "missing evolinux-sudo directive in sudoers file"
fi fi
fi fi
@ -1464,7 +1460,7 @@ readonly PROGDIR=$(realpath -m "$(dirname "$0")")
# shellcheck disable=2124 # shellcheck disable=2124
readonly ARGS=$@ readonly ARGS=$@
readonly VERSION="19.11.2" readonly VERSION="20.02.1"
# Disable LANG* # Disable LANG*
export LANG=C export LANG=C