]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
wheezy rsync as a client behaves differently
authorPeter Palfrader <peter@palfrader.org>
Sat, 8 Dec 2012 22:37:43 +0000 (23:37 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sat, 8 Dec 2012 22:37:43 +0000 (23:37 +0100)
modules/roles/files/static-mirroring/static-master-ssh-wrap

index 06ab715f4d95460222b43da34d858f997878b34c..6041a567b31441e314a202e965d0aa5d8d70efa5 100755 (executable)
@@ -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