several fixes

[dsa-puppet.git] / modules / roles / files / static-mirroring / static-master-ssh-wrap

diff --git a/modules/roles/files/static-mirroring/static-master-ssh-wrap b/modules/roles/files/static-mirroring/static-master-ssh-wrap
index da162159ac51d4935c03228012b0cbb3f1120524..d66f282fe5fb9c12a90f44a2f91e2ee54471d326 100755 (executable)
--- a/modules/roles/files/static-mirroring/static-master-ssh-wrap
+++ b/modules/roles/files/static-mirroring/static-master-ssh-wrap
@@ -76,12 +76,12 @@ do_rsync() {
 
        for component in $(awk -v this_host="$(hostname -f)" '$1 == this_host {print $2}' $COMPONENTLIST); do
          if [ "$*" = "$args $component/-new-/" ] || [ "$*" = "$args ./$component/-new-/" ] ; then
-                 local path="$BASEDIR/$component-current-push"
+                 local path="$BASEDIR/master/$component-current-push"
                  info "serving $remote_host with $path"
                  rsync $args "$path/."
                  return
-         elif [ "$*" = "$args . $component/-live-/" ] || [ "$*" = "$args . ./$component/-live-/" ] ; then
-                 local path="$BASEDIR/$component-current-live"
+         elif [ "$*" = "$args $component/-live-/" ] || [ "$*" = "$args ./$component/-live-/" ] ; then
+                 local path="$BASEDIR/master/$component-current-live"
                  info "host $remote_host wants $path, acquiring lock"
                  lock 200 "$path" 0
                  rsync $args "$path/."