From 950c6225fc079403ea777c6e5d6795a351e0e9f3 Mon Sep 17 00:00:00 2001 From: "thorsten.spille" Date: Tue, 12 Mar 2024 00:31:29 +0100 Subject: [PATCH] v1.0.5 --- CHANGELOG.md | 19 +++++++++++++------ bashclub-zsync/usr/bin/bashclub-zsync | 9 +++++---- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a57075a..ebe59fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,21 +1,28 @@ # Change log +## [v1.0.5] - 2024-02-22 + +### Fixed +- checkzfs_local parameter + ## [v1.0.4] - 2024-02-22 ### Added -- Fix download link in README.md -- Add checkzfs_local parameter to leave --source parameter empty -- Fix logrotate config +- checkzfs_local parameter to leave --source parameter empty + +### Fixed +- download link in README.md +- logrotate config ## [v1.0.3] - 2024-02-22 ### Added -- Add sshport to checkzfs command -- Add checkzfs spool options to default config +- sshport to checkzfs command +- checkzfs spool options to default config ## [v1.0.2] - 2024-02-21 -### Added +### Fixed - Fix checkzfs call and log message ## [v1.0.1] - 2024-02-11 diff --git a/bashclub-zsync/usr/bin/bashclub-zsync b/bashclub-zsync/usr/bin/bashclub-zsync index ed8a126..7c104c6 100644 --- a/bashclub-zsync/usr/bin/bashclub-zsync +++ b/bashclub-zsync/usr/bin/bashclub-zsync @@ -3,7 +3,7 @@ # bashclub zfs replication script # Author: (C) 2024 Thorsten Spille -__version__=v1.0.4 +__version__=v1.0.5 PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" @@ -321,11 +321,12 @@ if [ $checkzfs_disabled -eq 0 ]; then echo "<<>>" > /tmp/${checkzfs_spool_maxage}_${checkzfs_prefix} if [[ $checkzfs_local -eq 0 ]]; then - checkzfs_source=--source\ $source:$sshport + c_key=--source + c_value=$source:$sshport fi - if [[ $debug == "-v" ]]; then log "[DEBUG] Command:\n$checkzfs $checkzfs_source --output checkmk --threshold $checkzfs_max_age --maxsnapshots $checkzfs_max_snapshot_count --prefix $checkzfs_prefix --filter \"$checkzfs_filter\" >> /tmp/${checkzfs_spool_maxage}_${checkzfs_prefix}"; fi - $checkzfs $checkzfs_source --output checkmk --threshold $checkzfs_max_age --maxsnapshots $checkzfs_max_snapshot_count --prefix $checkzfs_prefix --filter "$checkzfs_filter" >> /tmp/${checkzfs_spool_maxage}_${checkzfs_prefix} + if [[ $debug == "-v" ]]; then log "[DEBUG] Command:\n$checkzfs $c_key $c_value --output checkmk --threshold $checkzfs_max_age --maxsnapshots $checkzfs_max_snapshot_count --prefix $checkzfs_prefix --filter \"$checkzfs_filter\" >> /tmp/${checkzfs_spool_maxage}_${checkzfs_prefix}"; fi + $checkzfs $c_key $c_value --output checkmk --threshold $checkzfs_max_age --maxsnapshots $checkzfs_max_snapshot_count --prefix $checkzfs_prefix --filter "$checkzfs_filter" >> /tmp/${checkzfs_spool_maxage}_${checkzfs_prefix} if [ $checkzfs_spool -eq 0 ]; then $mv /tmp/${checkzfs_spool_maxage}_${checkzfs_prefix} /var/lib/check_mk_agent/spool/ else