smedev/smeserver-koji
5
0
Fork 0
mirror of https://src.koozali.org/infra/smeserver-koji.git synced 2025-11-03 15:51:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed incorrect copy of builder cert create

Browse Source
This commit is contained in:
Trevor Batley
2023-09-11 16:44:51 +10:00
parent 557db9ba1e
commit 035ac9d80d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
koji-setup/koji-add-builder.sh
View File

@@ -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 sudo -u kojiadmin koji add-host-to-channel "$KOJI_BUILD_FQDN" createrepo
# Add server capacity # Add server capacity
sudo -u kojiadmin koji edit-host --capacity="$KOJID_CAPACITY" "$KOJI_BUILD_FQDN" 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 # check if local install or remote
if [[ $KOJI_BUILD_FQDN = $KOJI_HUB_FQDN ]] ; then if [[ $KOJI_BUILD_FQDN = $KOJI_HUB_FQDN ]] ; then
# deploy locally # deploy locally
@@ -89,14 +97,6 @@ else
# add build server to nfs exports line for /mnt/koji # add build server to nfs exports line for /mnt/koji
sed '/^\/mnt\/koji/ s/$/ $KOJI_BUILD_FQDN(ro,no_root_squash)/' /etc/exports 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) # generate a hub ssl key if there isn't one already (for scp & ssh to builder)
if [ ! -f /root/.ssh/id-rsa ] ; then if [ ! -f /root/.ssh/id-rsa ] ; then
# create a ssh key on build server # create a ssh key on build server