X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fstatic-mirroring%2Fstatic-mirror-ssh-wrap;h=a76c6455b8c4c43ed75ebb71a847536c430aba02;hb=df8f24895ce2f6f71c54701f90faf530a4405213;hp=b199ce981b9cba448ba8e533094691f680b5bc91;hpb=931160af7063a2f308434303bd9cd8f4a27d6e96;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/files/static-mirroring/static-mirror-ssh-wrap b/modules/roles/files/static-mirroring/static-mirror-ssh-wrap
index b199ce981..a76c6455b 100755
--- a/modules/roles/files/static-mirroring/static-mirror-ssh-wrap
+++ b/modules/roles/files/static-mirroring/static-mirror-ssh-wrap
@@ -36,7 +36,9 @@ COMPONENTLIST=/etc/static-components.conf
 usage() {
 	echo "local Usage: $0 <basedir> <host>"
 	echo "via ssh orig command:"
-	echo "                      mirror <serial>"
+	echo "                      mirror <component> <serial>"
+	echo "                      rsync ..."
+		do_rsync "$remote_host" "$@"
 }
 
 one_more_arg() {
@@ -59,10 +61,12 @@ do_mirror() {
 	local basedir="$1"; shift
 	local remote_host="$1"; shift
 	one_more_arg "$@"
+	local component="$1"; shift
+	one_more_arg "$@"
 	local serial="$1"; shift
 
-	info "Host $remote_host triggered a mirror run for serial $serial"
-	exec /usr/local/bin/static-mirror-run "$basedir" "$remote_host:-new-" "$serial"
+	info "Host $remote_host triggered a mirror run for $component, serial $serial"
+	exec /usr/local/bin/static-mirror-run "$basedir/mirrors/$component" "$remote_host:$component/-new-" "$serial"
 	echo >&2 "Exec failed"
 	croak "exec failed"
 }
@@ -75,8 +79,8 @@ do_rsync() {
 	allowed_rsyncs=()
 
 	if [ -e "$COMPONENTLIST" ]; then
-		for path in $(awk -v host="$(hostname -f)" '$2 == host {print $3}' $COMPONENTLIST); do
-			allowed_rsyncs+=("--server --sender -tre.iLsf . $path/.")
+		for path in $(awk -v host="$(hostname -f)" '$3 == host {print $4}' $COMPONENTLIST); do
+			allowed_rsyncs+=("--server --sender -lHtrze.iLsf --safe-links . $path/.")
 		done
 	fi
 	for cmd_idx in ${!allowed_rsyncs[*]}; do