From 1652f57beb4e3e9b604a5dbc08b9db4ba829ae3c Mon Sep 17 00:00:00 2001
From: Trevor Batley <trevor@batley.id.au>
Date: Fri, 15 Sep 2023 16:06:15 +1000
Subject: [PATCH] remove builders prompt loop

---
 README.md            | 10 +++++-----
 install-koji-farm.sh | 19 -------------------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 4d2dd7c..e1fc767 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ You will need to fill in some information on the way through.
   * accept the ECDSA key fingerprint of the web server
   * enter the root password for the web server
 * For each build server:
-  * enter the FQDN for the build server, if you haven't entered build=\<FQDN\> parameter/s
+  * enter the FQDN for the build server
   * accept the ECDSA key fingerprint of the build server
   * enter the root password for the build server
 
@@ -40,11 +40,11 @@ On your koji hub server:
 
 There are optional parameters available on the install-koji-farm.sh script
 
-    install-koji-farm.sh [web=<web server FQDN> | build=<build server FQDN> | debug]
+    install-koji-farm.sh [web=<web server FQDN> | build=<build server FQDN|prompt> | debug]
 
+* No parameters will deploy an all-in-one server with the web and builder installed on the hub.
 * 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.
+* You can have multiple build=\<builder FQDN\> parameters.
 * debug will print each command executed and be very noisy (still noisy without)
 
 The web interface will be available at http://\<web FQDN\>/koji
@@ -67,7 +67,7 @@ You can add Users for both the CLI and Web
     koji-add-user <User Name> [ permisssion=<permissions> | debug ]
 
 This will add them into the db and generate ssl CLI and browser keys, which will be bundled up in a tgz file at /etc/pki/koji/bundle/koji-\<User Name\>-bundle.tgz.
-This bundle should be extracted in their home (~) directory and will create a .koji directory with config and keys.
+This bundle should be extracted in their home (~) directory and will create a .koji directory with cli config and keys.
 
     cd ~
     tar -zxf koji-\<User Name\>-bundle.tgz
diff --git a/install-koji-farm.sh b/install-koji-farm.sh
index cbfe822..992ca63 100644
--- a/install-koji-farm.sh
+++ b/install-koji-farm.sh
@@ -233,25 +233,6 @@ deploy_builder () {
 if [ -z $KOJI_BUILD_FQDNS ] ; then
     # use hub if no builders entered
     deploy_builder $KOJI_HUB_FQDN
-elif [ $KOJI_BUILD_FQDNS = "prompt" ] ; then
-    # prompt for builders, if requested
-    echo "We will now deploy koji to your build servers"
-    MSG="Press <enter> to use your hub ($KOJI_HUB_FQDN), or enter the FQDN of your first build server) "
-    BSNO=1
-    while true ; do
-        read -p "Build Server FQDN: " FQDN
-        MSG="Add another Build Server (will stop asking if left blank) "
-        if [ -z $FQDN ] ; then
-            # if blank the first time add builder to the hub
-            if [[ $BSNO -gt 1 ]] ; then
-                break
-            else
-                FQDN=$KOJI_HUB_FQDN
-            fi
-        fi
-        deploy_builder $FQDN
-        ((BSNO=BSNO+1))
-    done
 else
     # use builders added as command line parameters
     for FQDN in ${KOJI_BUILD_FQDNS} ; do