X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-update-component.erb;h=2f70cfbb7d7ba917e319b1a9baa7986b1566effd;hb=f5aa9598cc51a64b70567e4b106565d46149a9b4;hp=d00d7494aede072f9bf51b84c600736167320437;hpb=529f0bbc5cfbcec2e92688331f3cb6b487bb8fab;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/static-mirroring/static-update-component.erb b/modules/roles/templates/static-mirroring/static-update-component.erb
index d00d7494a..2f70cfbb7 100755
--- a/modules/roles/templates/static-mirroring/static-update-component.erb
+++ b/modules/roles/templates/static-mirroring/static-update-component.erb
@@ -21,39 +21,58 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-componentlist=/etc/static-components.conf
-
-if [ "$#" != 1 ]; then
+usage() {
   echo >&2 "Usage: $0 <component>"
   exit 1
+}
+
+componentlist=/etc/static-components.conf
+
+if [ "$#" = 1 ]; then
+  component="$1"
+else
+  usage
 fi
 
-component="$1"
 
 if [ "${component%/*}" != "$component" ] ; then
   echo >&2 "$0: Invalid component: $component";
   exit 1
 fi
 
+thishost=$(hostname -f)
 srchost="$(awk -v component="$component" '$1 == component {print $2; exit}' "$componentlist")"
 srcdir="$(awk -v component="$component" '$1 == component {print $3; exit}' "$componentlist")"
+inextralist="$(
+               awk -v component="$component" -v host="$thishost" '
+                 $1 == component {
+                   split($4,extra,",")
+                   for (i in extra) {
+                     if (host == extra[i]) {
+                       printf "%s:%s\n", $2, $3
+                       exit
+                     }
+                   }
+                   exit
+                 }' "$componentlist"
+              )"
 if [ -z "$srchost" ] || [ -z "$srcdir" ]; then
   echo >&2 "$0: Invalid component: $component (not found in $componentlist)";
   exit 1
 fi
 
-if ! [ "$srchost" = "`hostname -f`" ]; then
-  echo >&2 "Component $component is sourced from $srchost, not this host."
+if ! [ "$srchost" = "$thishost" ] && [ -z "$inextralist" ]; then
+  echo >&2 "Component $component is sourced from $srchost, and this host is neither that nor in the extra allowed list."
   exit 1
 fi
 
-if ! [ -d "$srcdir" ]; then
+if [ "$srchost" = "$thishost" ] && ! [ -d "$srcdir" ]; then
   echo >&2 "Component source directory $srcdir does not exist or is not a directory, or is not accessible."
   exit 1
 fi
 
 if [ "`id -nu`" != "staticsync" ]; then
-  sudo -u staticsync static-update-component "$component"
+  sudo -u staticsync static-update-component "$@"
 else
   masters=()
 <%=
@@ -61,14 +80,14 @@ lines = []
 masters = []
 scope.lookupvar('site::localinfo').keys.sort.each do |node|
     if scope.lookupvar('site::localinfo')[node]['static_master']
-        lines << "masters+=(\"#{node}\"}"
+        lines << "  masters+=(\"#{node}\")"
     end
 end
 lines.join("\n")
 %>
 
   for master_idx in ${!masters[*]}; do
-    ssh "${masters[$master_idx]}" static-master-update-component "$component"
+    ssh -o AddressFamily=inet -t -o ServerAliveInterval=300 -o PreferredAuthentications=publickey "${masters[$master_idx]}" static-master-update-component "$component"
   done
 fi