From 035ac9d80d65c781410a67d22fa60440215a932e Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Mon, 11 Sep 2023 16:44:51 +1000 Subject: [PATCH] removed incorrect copy of builder cert create --- koji-setup/koji-add-builder.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/koji-setup/koji-add-builder.sh b/koji-setup/koji-add-builder.sh index dfab2c8..8304fa5 100644 --- a/koji-setup/koji-add-builder.sh +++ b/koji-setup/koji-add-builder.sh @@ -65,6 +65,14 @@ sudo -u kojiadmin koji add-host "$KOJI_BUILD_FQDN" "$RPM_ARCH" sudo -u kojiadmin koji add-host-to-channel "$KOJI_BUILD_FQDN" createrepo # Add server capacity sudo -u kojiadmin koji edit-host --capacity="$KOJID_CAPACITY" "$KOJI_BUILD_FQDN" +# Generate a certificate for the builder +if [ ! -f $SCRIPT_DIR/koji-gencert.sh ] ; then + curl $SILENT $SCRIPT_GIT/koji-gencert.sh > $SCRIPT_DIR/koji-gencert.sh +fi +cp $SCRIPT_DIR/koji-gencert.sh $KOJI_PKI_DIR/. +pushd "$KOJI_PKI_DIR" +./koji-gencert.sh "$KOJI_BUILD_FQDN" "/C=$COUNTRY_CODE/ST=$STATE/L=$LOCATION/O=$ORGANIZATION/CN=$KOJI_BUILD_FQDN" +popd # check if local install or remote if [[ $KOJI_BUILD_FQDN = $KOJI_HUB_FQDN ]] ; then # deploy locally @@ -89,14 +97,6 @@ else # add build server to nfs exports line for /mnt/koji sed '/^\/mnt\/koji/ s/$/ $KOJI_BUILD_FQDN(ro,no_root_squash)/' /etc/exports - # Generate a certificate for the builder - if [ ! -f $SCRIPT_DIR/koji-gencert.sh ] ; then - curl $SILENT $SCRIPT_GIT/koji-gencert.sh > $SCRIPT_DIR/koji-gencert.sh - fi - cp $SCRIPT_DIR/koji-gencert.sh $KOJI_PKI_DIR/. - pushd "$KOJI_PKI_DIR" - ./koji-gencert.sh "$KOJI_BUILD_FQDN" "/C=$COUNTRY_CODE/ST=$STATE/L=$LOCATION/O=$ORGANIZATION/CN=$KOJI_BUILD_FQDN" - popd # generate a hub ssl key if there isn't one already (for scp & ssh to builder) if [ ! -f /root/.ssh/id-rsa ] ; then # create a ssh key on build server