From ace13a2d14f21cd3976cdbc9cd9c8d2a08aff8f2 Mon Sep 17 00:00:00 2001
From: Trevor Batley <trevor@batley.id.au>
Date: Thu, 31 Aug 2023 12:28:25 +1000
Subject: [PATCH] remove KOJI_MOUNT_DIR

---
 koji-setup/deploy-koji-builder.sh    | 6 +-----
 koji-setup/deploy-koji-nfs-client.sh | 4 ++--
 koji-setup/parameters.sh             | 3 +--
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/koji-setup/deploy-koji-builder.sh b/koji-setup/deploy-koji-builder.sh
index 6ae3992..4349500 100755
--- a/koji-setup/deploy-koji-builder.sh
+++ b/koji-setup/deploy-koji-builder.sh
@@ -19,11 +19,7 @@ useradd -r kojibuilder
 usermod -G mock kojibuilder
 
 # Kojid Configuration Files
-if [[ "$KOJI_SLAVE_FQDN" = "$KOJI_MASTER_FQDN" ]]; then
-	KOJI_TOP_DIR="$KOJI_DIR"
-else
-	KOJI_TOP_DIR="$KOJI_MOUNT_DIR"
-fi
+KOJI_TOP_DIR="$KOJI_DIR"
 mkdir -p /etc/kojid
 cat > /etc/kojid/kojid.conf <<- EOF
 [kojid]
diff --git a/koji-setup/deploy-koji-nfs-client.sh b/koji-setup/deploy-koji-nfs-client.sh
index 2274166..b1e2c56 100755
--- a/koji-setup/deploy-koji-nfs-client.sh
+++ b/koji-setup/deploy-koji-nfs-client.sh
@@ -7,7 +7,7 @@ SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 source "$SCRIPT_DIR"/globals.sh
 source "$SCRIPT_DIR"/parameters.sh
 
-KOJI_MOUNT_SERVICE="${KOJI_MOUNT_DIR:1}"
+KOJI_MOUNT_SERVICE="${KOJI_DIR:1}"
 KOJI_MOUNT_SERVICE="${KOJI_MOUNT_SERVICE/\//-}".mount
 mkdir -p /etc/systemd/system
 cat > /etc/systemd/system/"$KOJI_MOUNT_SERVICE" <<- EOF
@@ -17,7 +17,7 @@ After=network.target
 
 [Mount]
 What=$KOJI_MASTER_FQDN:$KOJI_DIR
-Where=$KOJI_MOUNT_DIR
+Where=$KOJI_DIR
 Type=nfs
 Options=defaults,ro
 
diff --git a/koji-setup/parameters.sh b/koji-setup/parameters.sh
index e1405dc..de0ec80 100644
--- a/koji-setup/parameters.sh
+++ b/koji-setup/parameters.sh
@@ -3,8 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 ## KOJI RPM BUILD AND TRACKER
-export KOJI_DIR=/srv/koji
-export KOJI_MOUNT_DIR=/mnt/koji
+export KOJI_DIR=/mnt/koji
 export KOJI_MASTER_FQDN="$(hostname -f)"
 # Use master FQDN if build server on master
 #export KOJI_SLAVE_FQDN="$KOJI_MASTER_FQDN"