X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fstatic-mirroring%2Fstaticsync-ssh-wrap;h=959b4f8f0df84dd186c8ed3e4b0654836cd38050;hb=8e8ba57589b41c53f9885c4ad173a16ae94ae33f;hp=2858f4d13527c9dc9b6967c46e53699c522283cf;hpb=eac14934062bb7f700b06bc17e8d259fbd18d6d9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/files/static-mirroring/staticsync-ssh-wrap b/modules/roles/files/static-mirroring/staticsync-ssh-wrap
index 2858f4d13..959b4f8f0 100755
--- a/modules/roles/files/static-mirroring/staticsync-ssh-wrap
+++ b/modules/roles/files/static-mirroring/staticsync-ssh-wrap
@@ -24,8 +24,14 @@
 set -e
 set -u
 
+. /etc/staticsync.conf
+if ! [ -n "$base" ]; then
+  echo >&2 "base not configured!"
+  exit 1
+fi
+BASEDIR="$base"
+
 MYLOGNAME="`basename "$0"`[$$]"
-BASEDIR="/srv/static.debian.org"
 COMPONENTLIST=/etc/static-components.conf
 
 usage() {
@@ -74,25 +80,36 @@ do_mirror() {
 
 do_rsync_on_master() {
 	local remote_host="$1"; shift
-	local args="--server --sender -vlHtrze.iLsf --safe-links ."
+	local allowed_rsyncs
+	allowed_rsyncs=()
+	allowed_rsyncs+=("--server --sender -vlHtrze.iLsf --safe-links .") # wheezy
+	allowed_rsyncs+=("--server --sender -vlHtrze.iLsfx --safe-links .") # jessie
+	allowed_rsyncs+=("--server --sender -vlHtrze.iLsfxC --safe-links .") # stretch
 
-	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/master/$component-current-push"
-			info "serving $remote_host with $path"
-			exec rsync $args "$path/."
-			croak "Exec failed"
-		elif [ "$*" = "$args $component/-live-/" ] || [ "$*" = "$args ./$component/-live-/" ] ; then
-			local path="$BASEDIR/master/$component-current-live"
-			info "host $remote_host wants $path, acquiring lock"
-			exec 200< "$path"
-			if ! flock -s -w 0 200; then
-			echo >&2 "Cannot acquire shared lock on $path - this should mean an update is already underway anyway."
-			exit 1
+	for cmd_idx in ${!allowed_rsyncs[*]}; do
+		args="${allowed_rsyncs[$cmd_idx]}"
+		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/master/$component-current-push"
+				info "serving $remote_host with $path"
+				exec rsync $args "$path/."
+				croak "Exec failed"
+			elif [ "$*" = "$args $component/-live-/" ] || [ "$*" = "$args ./$component/-live-/" ] ; then
+				local path="$BASEDIR/master/$component-current-live"
+				info "host $remote_host wants $path, acquiring lock"
+				tgtlock="$BASEDIR/master/$component.lock"
+				if ! [ -e "$tgtlock" ]; then
+					touch "$tgtlock"
+				fi
+				exec 200< "$tgtlock"
+				if ! flock -s -w 0 200; then
+				echo >&2 "Cannot acquire shared lock on $tgtlock covering $path - this should mean an update is already underway anyway."
+				exit 1
+				fi
+				exec rsync $args "$path/."
+				croak "Exec failed"
 			fi
-			exec rsync $args "$path/."
-			croak "Exec failed"
-		fi
+		done
 	done
 }
 
@@ -105,7 +122,9 @@ do_rsync_on_source() {
 
 	if [ -e "$COMPONENTLIST" ]; then
 		for path in $(awk -v host="$(hostname -f)" '!/^ *(#|$)/ && $3 == host {print $4}' $COMPONENTLIST); do
-			allowed_rsyncs+=("--server --sender -lHtrze.iLsf --safe-links . $path/.")
+			allowed_rsyncs+=("--server --sender -lHtrze.iLsf --safe-links . $path/.") # wheezy
+			allowed_rsyncs+=("--server --sender -lHtrze.iLsfx --safe-links . $path/.") # jessie
+			allowed_rsyncs+=("--server --sender -lHtrze.iLsfxC --safe-links . $path/.") # stretch
 		done
 	fi
 	for cmd_idx in ${!allowed_rsyncs[*]}; do