smedev/smeserver-koji
6
0
Fork 0
mirror of https://src.koozali.org/infra/smeserver-koji.git synced 2024-11-22 09:37:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

tidy up comparators

Browse Source
This commit is contained in:
Trevor Batley 2023-10-03 09:37:54 +11:00
parent eeefccf002
commit 761e988eb4
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
install-koji-farm.sh
View File

@ -30,14 +30,16 @@ fi
echo "Checking connectivity..." echo "Checking connectivity..."
# install any required packages # install any required packages
if [[ -z $(dnf list installed | grep epel-release) ]] ; then if [[ "$KOJI_WEB_FQDN" != "$KOJI_HUB_FQDN" || "$KOJI_BUILD_FQDNS" ]] ; then
dnf install -y epel-release $QUIET if [[ -z $(dnf list installed | grep epel-release) ]] ; then
fi dnf install -y epel-release $QUIET
if [[ -z $(dnf list installed | grep netcat) ]] ; then fi
dnf install -y netcat $QUIET if [[ -z $(dnf list installed | grep netcat) ]] ; then
dnf install -y netcat $QUIET
fi
fi fi
if [[ ! $KOJI_WEB_FQDN = $KOJI_HUB_FQDN ]] ; then if [[ "$KOJI_WEB_FQDN" != "$KOJI_HUB_FQDN" ]] ; then
# check that I can conmnect # check that I can conmnect
if [[ -z $(nc -z $KOJI_WEB_FQDN 22 2>&1 | grep succeeded) ]] ; then if [[ -z $(nc -z $KOJI_WEB_FQDN 22 2>&1 | grep succeeded) ]] ; then
echo "I cannot connect to the web server at $KOJI_WEB_FQDN! Is it online? " echo "I cannot connect to the web server at $KOJI_WEB_FQDN! Is it online? "
@ -152,7 +154,7 @@ chmod o+x $SCRIPT_DIR/koji-parameters.sh
koji-deploy-hub.sh $DEBUG koji-deploy-hub.sh $DEBUG
# deploy the web koji components # deploy the web koji components
if [[ $KOJI_WEB_FQDN = $KOJI_HUB_FQDN ]] ; then if [[ "$KOJI_WEB_FQDN" == "$KOJI_HUB_FQDN" ]] ; then
# deploy locally (default) # deploy locally (default)
koji-deploy-web.sh $KOJI_WEB_FQDN $DEBUG koji-deploy-web.sh $KOJI_WEB_FQDN $DEBUG
else else