new style porterbox: eder, gabrielli, harris

[mirror/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 6041a56..625d3d9 100755 (executable)
--- a/modules/roles/files/static-mirroring/static-master-ssh-wrap
+++ b/modules/roles/files/static-mirroring/static-master-ssh-wrap
@@ -73,7 +73,7 @@ lock() {
 do_rsync() {
        local remote_host="$1"; shift
 
-       local args="--server --sender -vltrze.iLsf --safe-links ."
+       local args="--server --sender -vlHtrze.iLsf --safe-links ."
        if [ "$*" = "$args -new-/" ] || [ "$*" = "$args ./-new-/" ] ; then
                local path="$BASEDIR/current-push"
                info "serving $remote_host with $path"
@@ -97,7 +97,23 @@ do_update_component() {
        component="$1"
        shift
 
-       hit="$(awk -v component="$component" -v host="$remote_host" '$1 == component && $2 == host {print $3; exit}' "$COMPONENTLIST")"
+       hit="$(
+               awk -v component="$component" -v host="$remote_host" '
+                 $1 == component {
+                         if ($2 == host) {
+                                 print $3
+                                 exit
+                         }
+                         split($4,extra,",")
+                         for (i in extra) {
+                                 if (host == extra[i]) {
+                                         printf "%s:%s\n", $2, $3
+                                         exit
+                                 }
+                         }
+                         exit
+                 }' "$COMPONENTLIST"
+               )"
        if [ -n "$hit" ]; then
                exec static-master-update-component "$component"
                echo >&2 "Exec failed"