Mess with rsync options

diff --git a/modules/roles/files/static-mirroring/static-master-ssh-wrap b/modules/roles/files/static-mirroring/static-master-ssh-wrap
index df7e7217bc6e876891d3731d7105f89da2a060fa..b5c88be72321be8687474389b78ff878636fc5e0 100755 (executable)
--- a/modules/roles/files/static-mirroring/static-master-ssh-wrap
+++ b/modules/roles/files/static-mirroring/static-master-ssh-wrap
@@ -89,9 +89,9 @@ serve_dir() {
 do_rsync() {
        local remote_host="$1"; shift
 
-       if [ "$*" = "--server --sender -vlogDtprze.iLsf . -new-/" ] ; then
+       if [ "$*" = "--server --sender -vltrze.iLsf --safe-links . -new-/" ] ; then
                serve_dir "$remote_host" "$BASEDIR/current-push"
-       elif [ "$*" = "--server --sender -vlogDtprze.iLsf . -live-/" ] ; then
+       elif [ "$*" = "--server --sender -vltrze.iLsf --safe-links . -live-/" ] ; then
                local p="$BASEDIR/current-live"
                info "host $remote_host wants $p, acquiring lock"
                lock 200 "$p" 0

diff --git a/modules/roles/files/static-mirroring/static-master-update-component b/modules/roles/files/static-mirroring/static-master-update-component
index 197044f7cb5f63433f78ee37fbec07d273703c18..af8a5f7e2372644cde71c624e5b207bdd4f44aa8 100755 (executable)
--- a/modules/roles/files/static-mirroring/static-master-update-component
+++ b/modules/roles/files/static-mirroring/static-master-update-component
@@ -109,7 +109,8 @@ echo "$0: Got them."
 
 echo "$0: Updating master copy of $component..."
 rsync --delete \
-  -tr \
+  -trz \
+  --links --safe-links \
   --link-dest="$tgt" \
   "$src/." "$tmpdir_new/."
 echo "$0: Done.  Committing."

diff --git a/modules/roles/files/static-mirroring/static-mirror-run b/modules/roles/files/static-mirroring/static-mirror-run
index bdcc9283fdcc97dc23149a24a0aa8a1f8137b30e..b2bc078e1c3ed148eb7b3da459bc06dad472fdff 100755 (executable)
--- a/modules/roles/files/static-mirroring/static-mirror-run
+++ b/modules/roles/files/static-mirroring/static-mirror-run
@@ -64,7 +64,7 @@ if [ -z "$BASEDIR" ]; then usage >&2; exit 1; fi
 if [ -z "$SYNC_SOURCE" ]; then usage >&2; exit 1; fi
 
 RSYNC="rsync"
-RSYNC_BASE_OPTIONS="-avz --delete"
+RSYNC_BASE_OPTIONS="-rtvz --delete --links --safe-links"
 RSYNC_SSH_OPTIONS="ssh -o AddressFamily=inet -o BatchMode=yes"
 
 LOGDIR="$HOME/logs"

diff --git a/modules/roles/files/static-mirroring/static-mirror-ssh-wrap b/modules/roles/files/static-mirroring/static-mirror-ssh-wrap
index b199ce981b9cba448ba8e533094691f680b5bc91..9114879023f226fe9a893b2265b9dd37ce923b9d 100755 (executable)
--- a/modules/roles/files/static-mirroring/static-mirror-ssh-wrap
+++ b/modules/roles/files/static-mirroring/static-mirror-ssh-wrap
@@ -76,7 +76,7 @@ do_rsync() {
 
        if [ -e "$COMPONENTLIST" ]; then
                for path in $(awk -v host="$(hostname -f)" '$2 == host {print $3}' $COMPONENTLIST); do
-                       allowed_rsyncs+=("--server --sender -tre.iLsf . $path/.")
+                       allowed_rsyncs+=("--server --sender -ltrze.iLsf --safe-links . $path/.")
                done
        fi
        for cmd_idx in ${!allowed_rsyncs[*]}; do