mirror of
https://src.koozali.org/infra/smeserver-koji.git
synced 2024-11-25 02:57:28 +01:00
tidy up comparators
This commit is contained in:
parent
eeefccf002
commit
761e988eb4
@ -30,14 +30,16 @@ fi
|
||||
|
||||
echo "Checking connectivity..."
|
||||
# install any required packages
|
||||
if [[ -z $(dnf list installed | grep epel-release) ]] ; then
|
||||
if [[ "$KOJI_WEB_FQDN" != "$KOJI_HUB_FQDN" || "$KOJI_BUILD_FQDNS" ]] ; then
|
||||
if [[ -z $(dnf list installed | grep epel-release) ]] ; then
|
||||
dnf install -y epel-release $QUIET
|
||||
fi
|
||||
if [[ -z $(dnf list installed | grep netcat) ]] ; then
|
||||
fi
|
||||
if [[ -z $(dnf list installed | grep netcat) ]] ; then
|
||||
dnf install -y netcat $QUIET
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ ! $KOJI_WEB_FQDN = $KOJI_HUB_FQDN ]] ; then
|
||||
if [[ "$KOJI_WEB_FQDN" != "$KOJI_HUB_FQDN" ]] ; then
|
||||
# check that I can conmnect
|
||||
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? "
|
||||
@ -152,7 +154,7 @@ chmod o+x $SCRIPT_DIR/koji-parameters.sh
|
||||
koji-deploy-hub.sh $DEBUG
|
||||
|
||||
# deploy the web koji components
|
||||
if [[ $KOJI_WEB_FQDN = $KOJI_HUB_FQDN ]] ; then
|
||||
if [[ "$KOJI_WEB_FQDN" == "$KOJI_HUB_FQDN" ]] ; then
|
||||
# deploy locally (default)
|
||||
koji-deploy-web.sh $KOJI_WEB_FQDN $DEBUG
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user