forked from evolix/evocheck
IS_EVOBACKUP_EXCLUDE_MOUNT: exclude scripts without Rsync command
This commit is contained in:
parent
7ff09cd973
commit
7a57016da1
|
@ -7,6 +7,8 @@ and this project **does not adhere to [Semantic Versioning](http://semver.org/sp
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
|
IS_EVOBACKUP_EXCLUDE_MOUNT: exclude scripts without Rsync command
|
||||||
|
|
||||||
### Deprecated
|
### Deprecated
|
||||||
|
|
||||||
### Removed
|
### Removed
|
||||||
|
|
21
evocheck.sh
21
evocheck.sh
|
@ -601,14 +601,17 @@ check_evobackup_exclude_mount() {
|
||||||
|
|
||||||
# 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 the file seems to be a backup script, with an Rsync invocation
|
||||||
# then we verify that every mount is excluded
|
if grep -q "^\s*rsync" "${evobackup_file}"; then
|
||||||
if ! grep -q -- "^\s*--one-file-system" "${evobackup_file}"; then
|
# If rsync is not limited by "one-file-system"
|
||||||
grep -- "--exclude " "${evobackup_file}" | grep -E -o "\"[^\"]+\"" | tr -d '"' > "${excludes_file}"
|
# then we verify that every mount is excluded
|
||||||
not_excluded=$(findmnt --type nfs,nfs4,fuse.sshfs, -o target --noheadings | grep -v -f "${excludes_file}")
|
if ! grep -q -- "^\s*--one-file-system" "${evobackup_file}"; then
|
||||||
for mount in ${not_excluded}; do
|
grep -- "--exclude " "${evobackup_file}" | grep -E -o "\"[^\"]+\"" | tr -d '"' > "${excludes_file}"
|
||||||
failed "IS_EVOBACKUP_EXCLUDE_MOUNT" "${mount} is not excluded from ${evobackup_file} backup script"
|
not_excluded=$(findmnt --type nfs,nfs4,fuse.sshfs, -o target --noheadings | grep -v -f "${excludes_file}")
|
||||||
done
|
for mount in ${not_excluded}; do
|
||||||
|
failed "IS_EVOBACKUP_EXCLUDE_MOUNT" "${mount} is not excluded from ${evobackup_file} backup script"
|
||||||
|
done
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
@ -1429,7 +1432,7 @@ get_version() {
|
||||||
grep '^VERSION=' "${command}" | head -1 | cut -d '=' -f 2
|
grep '^VERSION=' "${command}" | head -1 | cut -d '=' -f 2
|
||||||
;;
|
;;
|
||||||
minifirewall)
|
minifirewall)
|
||||||
${command} status | head -1 | cut -d ' ' -f 3
|
${command} version | head -1 | cut -d ' ' -f 3
|
||||||
;;
|
;;
|
||||||
## Let's try the --version flag before falling back to grep for the constant
|
## Let's try the --version flag before falling back to grep for the constant
|
||||||
kvmstats)
|
kvmstats)
|
||||||
|
|
Loading…
Reference in a new issue