From b449bcc6ab2dbcdf4cf7b55f6ab472d5e4f7a499 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Tue, 29 Oct 2024 15:55:11 +0100 Subject: [PATCH] ddd --- roles/mgrote_rsync/templates/rsync_mirror.sh.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/mgrote_rsync/templates/rsync_mirror.sh.j2 b/roles/mgrote_rsync/templates/rsync_mirror.sh.j2 index e499c4a1..54c77908 100644 --- a/roles/mgrote_rsync/templates/rsync_mirror.sh.j2 +++ b/roles/mgrote_rsync/templates/rsync_mirror.sh.j2 @@ -4,12 +4,12 @@ {% for item in rsync_mirror_dirs %} {# Header #} echo "-----------------------" -echo "Source: {{ item.src }}" -echo "Destination: {{ item.dest.split(':') | last }}" +echo "Source: {{ item.src | regex_replace('\\/$', '' }}" +echo "Destination: {{ item.dest.split(':') | last | regex_replace('\\/$', '' }}" {# 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 | regex_replace('\\/$', '' }} 2>&1 > /dev/null ; 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 | regex_replace('\\/$', '' }} | cut -f3)" -eq "yes" ]] ; then rsync -e "ssh -i /etc/rsync_mirror/.ssh/id_rsync_mirror -o StrictHostKeyChecking=no" --dry-run --bwlimit={{ rsync_mirror_bw_limit }} --archive --verbose --itemize-changes --omit-dir-times --human-readable --stats --compress --fuzzy --force --delete-after --recursive {{ item.src }} {{ item.dest }} else echo "Destination-Dataset not mounted!"