From 327a49103d7e9bd4992cd1a495a2ea2e73cea151 Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Mon, 11 Sep 2023 16:57:02 +1000 Subject: [PATCH] add install parameters into README --- README.md | 8 ++++++++ install-koji-farm.sh | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9544bdb..5940117 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,14 @@ On your koji hub server: chmod o+x install-koji-farm.sh ./install-koji-farm.sh +There are optional parameters available on the install-koji-farm.sh script + + install-koji-farm.sh [web=\ | build=\ | debug] + +* The web server FQDN defaults to the hub FQDN, if not enetered. +* You can have multiple build= parameters (up to 7 parameters in total). This will bypass the build server prompt loop. +* If you enter build=<\hub FQDN\> you will get an all-in-one server with the builder installed on the hub. + The web interface will be available at http://\/koji ### Adding additional Build servers diff --git a/install-koji-farm.sh b/install-koji-farm.sh index 56d5d60..96e693a 100644 --- a/install-koji-farm.sh +++ b/install-koji-farm.sh @@ -4,7 +4,7 @@ set -e DEBUG= KOJI_HUB_FQDN="$(hostname -f)" KOJI_WEB_FQDN=$KOJI_HUB_FQDN -KOJI_Build_FQDN= +KOJI_BUILD_FQDNS= for param in $1 $2 $3 $4 $5 $6 $7; do if [ $param ] ; then case $param in @@ -13,7 +13,7 @@ for param in $1 $2 $3 $4 $5 $6 $7; do web=* ) KOJI_WEB_FQDN=${param#=*} ;; build=* ) - KOJI_BUILD_FQDN=$KOJI_BUILD_FQDN" "${param#=*} ;; + KOJI_BUILD_FQDNS=$KOJI_BUILD_FQDNS" "${param#=*} ;; esac else break @@ -216,8 +216,8 @@ deploy_builder () { } # if builders added as command line parameters, use those -if [ $KOJI_BUILD_FQDN ] ; then - for FQDN in ${KOJI_HUB_FQDN} ; do +if [ $KOJI_BUILD_FQDNS ] ; then + for FQDN in ${KOJI_HUB_FQDNS} ; do deploy_builder $FQDN done else