From 8e834b3c4a049c1bfe2d8f45aa7989055d43c1c2 Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Fri, 1 Sep 2023 15:30:13 +1000 Subject: [PATCH] tweak the remote execute statements --- install_koji_farm.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/install_koji_farm.sh b/install_koji_farm.sh index 3fcbee0..8a29e7d 100644 --- a/install_koji_farm.sh +++ b/install_koji_farm.sh @@ -127,17 +127,19 @@ if [ "$KOJI_BUILD_FQDN" != "$KOJI_HUB_FQDN" ] ; then ssh root@$KOJI_BUILD_FQDN mkdir $KOJI_PKI_DIR scp $KOJI_PKI_DIR/$KOJI_BUILD_FQDN.pem root@$KOJI_BUILD_FQDN:$KOJI_PKI_DIR/. scp $KOJI_PKI_DIR/koji_ca_cert.crt root@$KOJI_BUILD_FQDN:$KOJI_PKI_DIR/. - # copy across the parameter files + # copy across the parameter files (we built them on the hub) ssh root@$KOJI_BUILD_FQDN - scp $SCRIPT_DIR/globals.sh root@$KOJI_BUILD_FQDN:$SCRIPT_DIR/. - scp $SCRIPT_DIR/parameters.sh root@$KOJI_BUILD_FQDN:$SCRIPT_DIR/. + scp $SCRIPT_DIR/globals.sh root@$KOJI_BUILD_FQDN:$SCRIPT_DIR/globals.sh + scp $SCRIPT_DIR/parameters.sh root@$KOJI_BUILD_FQDN:$SCRIPT_DIR/parameters.sh # pull down the required scripts - ssh root@$KOJI_BUILD_FQDN curl $SCRIPT_GIT/deploy-koji-nfs-client.sh > $SCRIPT_DIR/. - ssh root@$KOJI_BUILD_FQDN curl $SCRIPT_GIT/deploy-koji-builder.sh > $SCRIPT_DIR/. + ssh root@$KOJI_BUILD_FQDN "curl $SCRIPT_GIT/deploy-koji-nfs-client.sh > $SCRIPT_DIR/deploy-koji-nfs-client.sh" + ssh root@$KOJI_BUILD_FQDN "curl $SCRIPT_GIT/deploy-koji-builder.sh > $SCRIPT_DIR/deploy-koji-builder.sh" + # make them executeable + ssh root@$KOJI_BUILD_FQDN chmod o+x $SCRIPT_DIR/* # connect to nfs share - ssh root@$KOJI_BUILD_FQDN deploy-koji-nfs-client.sh + ssh root@$KOJI_BUILD_FQDN $SCRIPT_DIR/deploy-koji-nfs-client.sh # deploy koji builder - ssh root@$KOJI_BUILD_FQDN deploy-koji-builder.sh + ssh root@$KOJI_BUILD_FQDN $SCRIPT_DIR/deploy-koji-builder.sh fi #