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 df7e721..625d3d9 100755 (executable)
--- a/modules/roles/files/static-mirroring/static-master-ssh-wrap
+++ b/modules/roles/files/static-mirroring/static-master-ssh-wrap
@@ -70,32 +70,19 @@ lock() {
   fi
 }
 
-serve_dir() {
-       local remote_host="$1"; shift
-       local path="$1"; shift
-
-       local sender='rsync --server --sender -vlogDtprze.iLsf . '
-
-       if [ -e "$path" ]; then
-               info "serving $remote_host with $path"
-               $sender "$path/"
-       else
-               info "$remote_host wants non-existing $path"
-               echo >&2 "$path does not exist."
-               exit 1
-       fi
-}
-
 do_rsync() {
        local remote_host="$1"; shift
 
-       if [ "$*" = "--server --sender -vlogDtprze.iLsf . -new-/" ] ; then
-               serve_dir "$remote_host" "$BASEDIR/current-push"
-       elif [ "$*" = "--server --sender -vlogDtprze.iLsf . -live-/" ] ; then
-               local p="$BASEDIR/current-live"
-               info "host $remote_host wants $p, acquiring lock"
-               lock 200 "$p" 0
-               serve_dir "$remote_host" "$p"
+       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"
+               rsync $args "$path/."
+       elif [ "$*" = "$args . -live-/" ] || [ "$*" = "$args . ./-live-/" ] ; then
+               local path="$BASEDIR/current-live"
+               info "host $remote_host wants $path, acquiring lock"
+               lock 200 "$path" 0
+               rsync $args "$path/."
        else
                info "NOT allowed for $remote_host: rsync $*"
                echo >&2 "This rsync command ($@) not allowed."
@@ -110,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"