From b76500327e4cbdec8526caaa5ba8bf4d84f9fb45 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Thu, 31 Oct 2024 11:06:01 +0100 Subject: [PATCH] dfg --- roles/mgrote_rsync/templates/rsync_mirror.sh.j2 | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/roles/mgrote_rsync/templates/rsync_mirror.sh.j2 b/roles/mgrote_rsync/templates/rsync_mirror.sh.j2 index 352dfd13..71b3f7d2 100644 --- a/roles/mgrote_rsync/templates/rsync_mirror.sh.j2 +++ b/roles/mgrote_rsync/templates/rsync_mirror.sh.j2 @@ -7,7 +7,7 @@ echo "-----------------------" echo "Source: {{ item.src }}" echo "Destination: {{ item.dest.split(':') | last }}" {# Mount check source #} -if /usr/sbin/zfs get mounted -H {{ item.src }} > /dev/null 2>&1 ; then +if [[ "$(/usr/sbin/zfs get mounted -H {{ item.src | regex_replace('^/', '') }} | cut -f3)" = "yes" ; 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)" = "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 }}/ @@ -19,16 +19,3 @@ else echo "Source-Dataset not mounted!" fi {% endfor %} - -{# Beispiel -echo "-----------------------" -echo "Source: /hdd_data/tmp/" -if /usr/sbin/zfs get mounted -H /hdd_data/tmp/ 2>&1 > /dev/null ; then - if [[ "$(ssh -i /etc/rsync_mirror/.ssh/id_rsync_mirror -o StrictHostKeyChecking=no rsync_mirror@pbs.mgrote.net /usr/sbin/zfs get mounted -H /backup/pve5/tmp | cut -f3)" -eq "yes" ]] ; then - rsync -e "ssh -i /etc/rsync_mirror/.ssh/id_rsync_mirror -o StrictHostKeyChecking=no" --itemize-changes --bwlimit=2m --verbose --omit-dir-times --archive --human-readable --stats --compress --fuzzy --force --delete-after --recursive /hdd_data/tmp/ rsync_mirror@pbs.mgrote.net:/backup/pve5/tmp/ - else - echo "Destination-Dataset not mounted!" - fi -else - echo "Source-Dataset not mounted!" -fi#}