X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fstatic-mirroring%2Fstaticsync-ssh-wrap;h=959b4f8f0df84dd186c8ed3e4b0654836cd38050;hb=3b29c4516cf2a90765ee8a2609157e502c4f7182;hp=dfd98c8420dab78f13bcec49f66393fe2547ba18;hpb=9b17251659b22a13b308212ee02303ed208b3464;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 dfd98c842..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() {
@@ -91,9 +97,13 @@ do_rsync_on_master() {
 			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"
+				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 $path - this should mean an update is already underway anyway."
+				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/."