From c73119860d16f410891cfbb46db21569dff77db8 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 7 Apr 2013 20:55:32 +0200 Subject: [PATCH] Try to allow additional push hosts --- .../static-mirroring/static-components.conf | 3 ++- .../static-mirroring/static-master-ssh-wrap | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/roles/files/static-mirroring/static-components.conf b/modules/roles/files/static-mirroring/static-components.conf index 6ce4e3aa..f028ff2d 100644 --- a/modules/roles/files/static-mirroring/static-components.conf +++ b/modules/roles/files/static-mirroring/static-components.conf @@ -1,7 +1,8 @@ # puppetd maintained +# mozilla.debian.net wagner.debian.org /srv/home/groups/pkg-mozilla/htdocs planet.debian.org senfl.debian.org /srv/planet.debian.org/www www.debian.org wolkenstein.debian.org /srv/www.debian.org/www bits.debian.org master.debian.org /srv/bits-master.debian.org/htdocs -backports.debian.org ries.debian.org /srv/backports.debian.org/htdocs +backports.debian.org ries.debian.org /srv/backports.debian.org/htdocs franck.debian.org diff --git a/modules/roles/files/static-mirroring/static-master-ssh-wrap b/modules/roles/files/static-mirroring/static-master-ssh-wrap index 9c543bf0..625d3d9b 100755 --- a/modules/roles/files/static-mirroring/static-master-ssh-wrap +++ b/modules/roles/files/static-mirroring/static-master-ssh-wrap @@ -97,7 +97,23 @@ do_update_component() { component="$1" shift - hit="$(awk -v component="$component" -v host="$remote_host" '$1 == component && $2 == host {print $3; exit}' "$COMPONENTLIST")" + hit="$( + awk -v component="$component" -v host="$remote_host" ' + $1 == component { + if ($2 == host) { + print $3 + exit + } + split($4,extra,",") + for (i in extra) { + if (host == extra[i]) { + printf "%s:%s\n", $2, $3 + exit + } + } + exit + }' "$COMPONENTLIST" + )" if [ -n "$hit" ]; then exec static-master-update-component "$component" echo >&2 "Exec failed" -- 2.39.2