X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fssh_upload%2Frsync-ssh-wrap;h=f2a8917fed3539244afbc62eef5413dd6290721c;hb=804bf56bec0b237c2bd91758b198e773cf75f631;hp=8f3e8d896a2f6fd99e922ca34b5996c98f9b17ab;hpb=6a94b204599f27a5ec786e03242b594fb51bc7fc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/files/ssh_upload/rsync-ssh-wrap b/modules/roles/files/ssh_upload/rsync-ssh-wrap
index 8f3e8d896..f2a8917fe 100755
--- a/modules/roles/files/ssh_upload/rsync-ssh-wrap
+++ b/modules/roles/files/ssh_upload/rsync-ssh-wrap
@@ -26,7 +26,7 @@ set -e
 set -u
 
 MYLOGNAME="`basename "$0"`[$$]"
-RSYNCDIR="/srv/upload.debian.org/UploadQueue/"
+RSYNCDIRS=(/srv/upload.debian.org/UploadQueue/ /srv/security.upload.debian.org/SecurityUploadQueue/)
 
 usage() {
 	echo "local Usage: $0 <host>"
@@ -56,15 +56,19 @@ do_rsync() {
 	local allowed_rsyncs
 	allowed_rsyncs=()
 
-	if [ -d "$RSYNCDIR" ]; then
-		allowed_rsyncs+=("--server -vlogDtprxze.iLsf --partial . $RSYNCDIR") # wheezy
-		allowed_rsyncs+=("--server -vlogDtprxze.iLsfx --partial . $RSYNCDIR") # jessie
-	fi
+	local rsyncdir
+	for rsyncdir in "${RSYNCDIRS[@]}"; do
+		if [ -d "$rsyncdir" ]; then
+			allowed_rsyncs+=("--server -vlogDtprxze.iLsf --partial . $rsyncdir") # wheezy
+			allowed_rsyncs+=("--server -vlogDtprxze.iLsfx --partial . $rsyncdir") # jessie
+			allowed_rsyncs+=("--server -vlogDtprxze.iLsfxC --partial . $rsyncdir") # stretch
+		fi
+	done
 	for cmd_idx in ${!allowed_rsyncs[*]}; do
 		allowed="${allowed_rsyncs[$cmd_idx]}"
 		if [ "$*" = "$allowed" ]; then
 			info "Running for host $remote_host: rsync $*"
-			exec rsync "$@"
+			exec rsync --chmod=F640 "$@"
 			croak "Exec failed"
 		fi
 	done