add sudo access to group cloud-builds

[mirror/dsa-puppet.git] / modules / roles / files / static-mirroring / staticsync-ssh-wrap

diff --git a/modules/roles/files/static-mirroring/staticsync-ssh-wrap b/modules/roles/files/static-mirroring/staticsync-ssh-wrap
index ba88088..959b4f8 100755 (executable)
--- 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() {
@@ -78,6 +84,7 @@ do_rsync_on_master() {
        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 cmd_idx in ${!allowed_rsyncs[*]}; do
                args="${allowed_rsyncs[$cmd_idx]}"
@@ -90,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/."
@@ -113,6 +124,7 @@ do_rsync_on_source() {
                for path in $(awk -v host="$(hostname -f)" '!/^ *(#|$)/ && $3 == host {print $4}' $COMPONENTLIST); do
                        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