X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fstatic-mirroring%2Fstatic-master-ssh-wrap;h=6041a567b31441e314a202e965d0aa5d8d70efa5;hb=3cdf7724a49fd2546d1e5a35c44531540e275aa1;hp=06ab715f4d95460222b43da34d858f997878b34c;hpb=f42cb0499ff05950c567b58393e81ffe77292b49;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/files/static-mirroring/static-master-ssh-wrap b/modules/roles/files/static-mirroring/static-master-ssh-wrap index 06ab715f4..6041a567b 100755 --- a/modules/roles/files/static-mirroring/static-master-ssh-wrap +++ b/modules/roles/files/static-mirroring/static-master-ssh-wrap @@ -74,11 +74,11 @@ do_rsync() { local remote_host="$1"; shift local args="--server --sender -vltrze.iLsf --safe-links ." - if [ "$*" = "$args -new-/" ] ; then + if [ "$*" = "$args -new-/" ] || [ "$*" = "$args ./-new-/" ] ; then local path="$BASEDIR/current-push" info "serving $remote_host with $path" rsync $args "$path/." - elif [ "$*" = "$args . -live-/" ] ; then + elif [ "$*" = "$args . -live-/" ] || [ "$*" = "$args . ./-live-/" ] ; then local path="$BASEDIR/current-live" info "host $remote_host wants $path, acquiring lock" lock 200 "$path" 0