From 44b09ef850912ce8b7a5af8fe4a47d48b8cbbf68 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Tue, 8 Dec 2020 10:43:10 +0100 Subject: [PATCH] support multiple values for SQL_BACKUP_PATH and POSTGRES_BACKUP_PATH --- CHANGELOG | 2 ++ evocheck.sh | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 2056ae2..87604cc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,8 @@ and this project **does not adhere to [Semantic Versioning](http://semver.org/sp ### Added +* support multiple values for SQL_BACKUP_PATH and POSTGRES_BACKUP_PATH + ### Changed * IS_EVOBACKUP_EXCLUDE_MOUNT: exclude disabled backup scripts diff --git a/evocheck.sh b/evocheck.sh index 9234059..51619d3 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -881,15 +881,25 @@ check_sql_backup() { if (is_installed "mysql-server" || is_installed "mariadb-server"); then # You could change the default path in /etc/evocheck.cf SQL_BACKUP_PATH=${SQL_BACKUP_PATH:-"/home/backup/mysql.bak.gz"} - test -f "$SQL_BACKUP_PATH" || failed "IS_SQL_BACKUP" "MySQL dump is missing (${SQL_BACKUP_PATH})" + for backup_path in ${SQL_BACKUP_PATH}; do + if [ ! -f "${backup_path}" ]; then + failed "IS_SQL_BACKUP" "MySQL dump is missing (${backup_path})" + test "${VERBOSE}" = 1 || break + fi + done fi } check_postgres_backup() { - if is_installed "postgresql-9*"; then + if is_installed "postgresql-9*" || is_installed "postgresql-1*"; then # If you use something like barman, you should disable this check # You could change the default path in /etc/evocheck.cf POSTGRES_BACKUP_PATH=${POSTGRES_BACKUP_PATH:-"/home/backup/pg.dump.bak*"} - test -f ${POSTGRES_BACKUP_PATH} || failed "IS_POSTGRES_BACKUP" "PostgreSQL dump is missing (${POSTGRES_BACKUP_PATH})" + for backup_path in ${POSTGRES_BACKUP_PATH}; do + if [ ! -f "${backup_path}" ]; then + failed "IS_POSTGRES_BACKUP" "PostgreSQL dump is missing (${backup_path})" + test "${VERBOSE}" = 1 || break + fi + done fi } check_mongo_backup() {