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

evocheck: upstream release 22.04.1

Browse source
This commit is contained in:
Jérémy Lecour 2022-04-25 10:33:33 +02:00 committed by Jérémy Lecour
parent cf8aa1a5d3
commit daa54cac8f
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -20,7 +20,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
### Changed ### Changed
* evocheck: upstream release 22.04 * evocheck: upstream release 22.04.1
* evolinux-base: Add non-free repos & install non-free firmware on dedicated hardware * evolinux-base: Add non-free repos & install non-free firmware on dedicated hardware
* evolinux-base: rename backup-server-state to dump-server-state * evolinux-base: rename backup-server-state to dump-server-state
* dump-server-state: upstream release 22.04.1 * dump-server-state: upstream release 22.04.1

28
evocheck/files/evocheck.sh
View file

@ -4,7 +4,7 @@
# Script to verify compliance of a Debian/OpenBSD server # Script to verify compliance of a Debian/OpenBSD server
# powered by Evolix # powered by Evolix
VERSION="22.04" VERSION="22.04.1"
readonly VERSION readonly VERSION
# base functions # base functions
@ -596,20 +596,20 @@ check_evobackup() {
} }
# Vérification de l'exclusion des montages (NFS) dans les sauvegardes # Vérification de l'exclusion des montages (NFS) dans les sauvegardes
check_evobackup_exclude_mount() { check_evobackup_exclude_mount() {
excludes_file=$(mktemp --tmpdir=${TMPDIR:-/tmp} "evocheck.evobackup_exclude_mount.XXXXX") excludes_file=$(mktemp --tmpdir="${TMPDIR:-/tmp}" "evocheck.evobackup_exclude_mount.XXXXX")
files_to_cleanup="${files_to_cleanup} ${excludes_file}" files_to_cleanup="${files_to_cleanup} ${excludes_file}"
# shellcheck disable=SC2044 # shellcheck disable=SC2044
for evobackup_file in $(find /etc/cron* -name '*evobackup*' | grep -v -E ".disabled$"); do for evobackup_file in $(find /etc/cron* -name '*evobackup*' | grep -v -E ".disabled$"); do
# If rsync is not limited by "one-file-system" # If rsync is not limited by "one-file-system"
# then we verify that every mount is excluded # then we verify that every mount is excluded
grep -q -- "^\s*--one-file-system" "${evobackup_file}" \ if ! grep -q -- "^\s*--one-file-system" "${evobackup_file}"; then
|| grep -- "--exclude " "${evobackup_file}" | grep -E -o "\"[^\"]+\"" | tr -d '"' \ grep -- "--exclude " "${evobackup_file}" | grep -E -o "\"[^\"]+\"" | tr -d '"' > "${excludes_file}"
> "${excludes_file}" not_excluded=$(findmnt --type nfs,nfs4,fuse.sshfs, -o target --noheadings | grep -v -f "${excludes_file}")
not_excluded=$(findmnt --type nfs,nfs4,fuse.sshfs, -o target --noheadings | grep -v -f "${excludes_file}") for mount in ${not_excluded}; do
for mount in ${not_excluded}; do failed "IS_EVOBACKUP_EXCLUDE_MOUNT" "${mount} is not excluded from ${evobackup_file} backup script"
failed "IS_EVOBACKUP_EXCLUDE_MOUNT" "${mount} is not excluded from ${evobackup_file} backup script" done
done fi
done done
} }
# Verification de la presence du userlogrotate # Verification de la presence du userlogrotate
@ -1074,7 +1074,7 @@ check_duplicate_fs_label() {
# Do it only if thereis blkid binary # Do it only if thereis blkid binary
BLKID_BIN=$(command -v blkid) BLKID_BIN=$(command -v blkid)
if [ -n "$BLKID_BIN" ]; then if [ -n "$BLKID_BIN" ]; then
tmpFile=$(mktemp --tmpdir=${TMPDIR:-/tmp} "evocheck.duplicate_fs_label.XXXXX") tmpFile=$(mktemp --tmpdir="${TMPDIR:-/tmp}" "evocheck.duplicate_fs_label.XXXXX")
files_to_cleanup="${files_to_cleanup} ${tmpFile}" files_to_cleanup="${files_to_cleanup} ${tmpFile}"
parts=$($BLKID_BIN -c /dev/null | grep -ve raid_member -e EFI_SYSPART | grep -Eo ' LABEL=".*"' | cut -d'"' -f2) parts=$($BLKID_BIN -c /dev/null | grep -ve raid_member -e EFI_SYSPART | grep -Eo ' LABEL=".*"' | cut -d'"' -f2)
@ -1473,7 +1473,7 @@ add_to_path() {
echo "$PATH" | grep -qF "${new_path}" || export PATH="${PATH}:${new_path}" echo "$PATH" | grep -qF "${new_path}" || export PATH="${PATH}:${new_path}"
} }
check_versions() { check_versions() {
versions_file=$(mktemp --tmpdir=${TMPDIR:-/tmp} "evocheck.versions.XXXXX") versions_file=$(mktemp --tmpdir="${TMPDIR:-/tmp}" "evocheck.versions.XXXXX")
files_to_cleanup="${files_to_cleanup} ${versions_file}" files_to_cleanup="${files_to_cleanup} ${versions_file}"
download_versions "${versions_file}" download_versions "${versions_file}"
@ -1501,7 +1501,7 @@ main() {
# Detect operating system name, version and release # Detect operating system name, version and release
detect_os detect_os
main_output_file=$(mktemp --tmpdir=${TMPDIR:-/tmp} "evocheck.main.XXXXX") main_output_file=$(mktemp --tmpdir="${TMPDIR:-/tmp}" "evocheck.main.XXXXX")
files_to_cleanup="${files_to_cleanup} ${main_output_file}" files_to_cleanup="${files_to_cleanup} ${main_output_file}"
#----------------------------------------------------------- #-----------------------------------------------------------
@ -1733,7 +1733,9 @@ main() {
fi fi
if [ -f "${main_output_file}" ]; then if [ -f "${main_output_file}" ]; then
if [ $(cat "${main_output_file}" | wc -l) -gt 0 ]; then lines_found=$(wc -l < "${main_output_file}")
# shellcheck disable=SC2086
if [ ${lines_found} -gt 0 ]; then
cat "${main_output_file}" 2>&1 cat "${main_output_file}" 2>&1
fi fi