From 914a11bddd3afbe9453766b49ebaf44a5e2819df Mon Sep 17 00:00:00 2001
From: Trevor Batley <trevor@batley.id.au>
Date: Wed, 6 Sep 2023 10:22:05 +1000
Subject: [PATCH] include add user in README and install script

---
 README.md            | 21 +++++++++++++++++----
 install-koji-farm.sh |  1 +
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 2d8f4c5..1320cec 100644
--- a/README.md
+++ b/README.md
@@ -17,16 +17,17 @@ Thanks to George T Kramer for doing a lot of the prework for these over at Clear
 * servers are reachable by their FQDNs (DNS or you've added them into the appropriate /etc/hosts files)
 * Koji builder can exist on the hub or multiple build servers
 
-### Getting Going
+### Installing
 
 The install script will install all required components on the hub and build servers.
 
 You will need to fill in some information on the way through.
 
 * info for your ssl certs (Country, State, City, Org, Org Unit)
-* enter the FQDN for each build server
-* accept the ECDSA key fingerprint for each build server
-* enter the root password for each build server
+* For each build server:
+  * enter the FQDN for the build server
+  * accept the ECDSA key fingerprint of the build server
+  * enter the root password for the build server
 
 If you add debug on the install-koji-farm.sh line it will print each command executed and be very noisy (still noisy without)
 
@@ -49,6 +50,18 @@ It should already be there from the install, but if not
     curl https://src.koozali.org/smedev/smeserver-koji/raw/branch/master/koji-setup/koji-add-builder.sh > ~/bin/koji-add-builder.sh
     chmod o+x ~/bin/koji-add-builder.sh
 
+### Adding Users
+
+You can add Users for both the CLI and Web
+
+    koji-add-user <User Name> [ permisssions=<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.
+
+    cd ~
+    tar -zxf koji-\<User Name\>-bundle.tgz
+
 ### Other components
 
 The other scripts in the repository are used by the install-koji-farm.sh and koji-add-builder.sh scripts or I'm still experimenting with them :)
diff --git a/install-koji-farm.sh b/install-koji-farm.sh
index 000e4db..cfa9451 100644
--- a/install-koji-farm.sh
+++ b/install-koji-farm.sh
@@ -29,6 +29,7 @@ mkdir -p $SCRIPT_DIR
 curl $SILENT $SCRIPT_GIT/koji-deploy-hub.sh > $SCRIPT_DIR/koji-deploy-hub.sh
 curl $SILENT $SCRIPT_GIT/koji-add-builder.sh > $SCRIPT_DIR/koji-add-builder.sh
 curl $SILENT $SCRIPT_GIT/koji-bootstrap-build.sh > $SCRIPT_DIR/koji-bootstrap-build.sh
+curl $SILENT $SCRIPT_GIT/koji-add-user.sh > $SCRIPT_DIR/koji-add-user.sh
 chmod o+x $SCRIPT_DIR/*.sh
 
 # install any required packages