From 88899fb0fe6e2fe5829e2a7e87ab92716a1e4a32 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Fri, 25 Sep 2020 15:53:13 +0200 Subject: [PATCH 1/3] fix bad destination directory for mysql backups --- zzz_evobackup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zzz_evobackup b/zzz_evobackup index d0f4f57..b38afc2 100755 --- a/zzz_evobackup +++ b/zzz_evobackup @@ -156,9 +156,9 @@ if [ "${LOCAL_TASKS}" = "1" ]; then ## example with two dumps for each table (.sql/.txt) for all databases # for i in $(echo SHOW DATABASES | mysql --defaults-extra-file=/etc/mysql/debian.cnf -P 3306 \ # | egrep -v "^(Database|information_schema|performance_schema|sys)" ); \ - # do mkdir -p -m 700 ${LOCAL_BACKUP_DIR}/mysql/$i ; chown -RL mysql /home/mysqldump ; \ + # do mkdir -p -m 700 /home/mysqldump/$i ; chown -RL mysql /home/mysqldump ; \ # mysqldump --defaults-extra-file=/etc/mysql/debian.cnf --force -P 3306 -Q --opt --events --hex-blob --skip-comments \ - # --fields-enclosed-by='\"' --fields-terminated-by=',' -T ${LOCAL_BACKUP_DIR}/mysql/$i $i; done + # --fields-enclosed-by='\"' --fields-terminated-by=',' -T /home/mysqldump/$i $i; done ## Dump all grants (requires 'percona-toolkit' package) # mkdir -p -m 700 ${LOCAL_BACKUP_DIR}/mysql/ From cf95909f0bc1ff9949106c2a652f1a8b9e5ae6e0 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Mon, 5 Oct 2020 11:36:02 +0200 Subject: [PATCH 2/3] bkctld: Replace xargs with a simple loop --- CHANGELOG.md | 2 ++ bkctld | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb3e69c..cb209c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +* bkctld: Replace xargs with a simple loop + ### Deprecated ### Removed diff --git a/bkctld b/bkctld index 353773b..864b4ed 100755 --- a/bkctld +++ b/bkctld @@ -76,7 +76,9 @@ case "${subcommand}" in "start" | "stop" | "reload" | "restart" | "sync" | "update" | "remove" | "firewall" | "upgrade-config") jail_name="${2:-}" if [ "${jail_name}" = "all" ]; then - "${LIBDIR}/bkctld-list" | xargs --no-run-if-empty --max-args=1 --max-procs=0 "${LIBDIR}/bkctld-${subcommand}" + for jail in $("${LIBDIR}/bkctld-list"); do + "${LIBDIR}/bkctld-${subcommand}" "${jail}" + done elif [ -z "${jail_name}" ]; then "${LIBDIR}/bkctld-help" exit 1 @@ -87,7 +89,9 @@ case "${subcommand}" in "status") jail_name="${2:-}" if [ "${jail_name}" = "all" ] || [ -z "${jail_name}" ]; then - "${LIBDIR}/bkctld-list" | xargs --no-run-if-empty --max-args=1 "${LIBDIR}/bkctld-${subcommand}" + for jail in $("${LIBDIR}/bkctld-list"); do + "${LIBDIR}/bkctld-${subcommand}" "${jail}" + done else "${LIBDIR}/bkctld-${subcommand}" "${jail_name}" fi From 6fe81c7077794570780e8116d910f648311402e0 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Wed, 7 Oct 2020 18:35:00 +0200 Subject: [PATCH 3/3] Release 2.5.1 --- CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb209c3..a743dcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,8 +10,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -* bkctld: Replace xargs with a simple loop - ### Deprecated ### Removed @@ -20,6 +18,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Security +## [2.5.1] - 2020-10-07 + +### Changed + +* bkctld: Replace xargs with a simple loop + ## [2.5.0] - 2020-09-25 ### Fixed