From c472b9a6f9faf01dd831a6533ab5fb6527c4b531 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Tue, 29 Oct 2024 21:18:33 +0100 Subject: [PATCH] dfg --- roles/mgrote_rsync/templates/rsync_mirror.sh.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/mgrote_rsync/templates/rsync_mirror.sh.j2 b/roles/mgrote_rsync/templates/rsync_mirror.sh.j2 index 0f69a016..352dfd13 100644 --- a/roles/mgrote_rsync/templates/rsync_mirror.sh.j2 +++ b/roles/mgrote_rsync/templates/rsync_mirror.sh.j2 @@ -7,9 +7,9 @@ echo "-----------------------" echo "Source: {{ item.src }}" echo "Destination: {{ item.dest.split(':') | last }}" {# Mount check source #} -if /usr/sbin/zfs get mounted -H {{ item.src }} 2>&1 > /dev/null ; then +if /usr/sbin/zfs get mounted -H {{ item.src }} > /dev/null 2>&1 ; then {# Mount check destination #} - if [[ "$(ssh -i /etc/rsync_mirror/.ssh/id_rsync_mirror -o StrictHostKeyChecking=no {{ item.dest.split(':') | first }} /usr/sbin/zfs get mounted -H {{ item.dest.split(':') | last }} | cut -f3)" -eq "yes" ]] ; then + if [[ "$(ssh -i /etc/rsync_mirror/.ssh/id_rsync_mirror -o StrictHostKeyChecking=no {{ item.dest.split(':') | first }} /usr/sbin/zfs get mounted -H {{ item.dest.split(':') | last }} | cut -f3)" = "yes" ]] ; then rsync -e "ssh -i /etc/rsync_mirror/.ssh/id_rsync_mirror -o StrictHostKeyChecking=no" --bwlimit={{ rsync_mirror_bw_limit }} --archive --verbose --inplace --itemize-changes --omit-dir-times --human-readable --stats --compress --fuzzy --force --partial --delete-after --recursive {{ item.src }}/ {{ item.dest }}/ {# "/" am Ende von Src+Dest ist Wichtig und notwendig, sonst wird in Unterordner kopiert #} else