smedev/smeserver-koji
6
0
Fork 0
mirror of https://src.koozali.org/infra/smeserver-koji.git synced 2024-11-25 02:57:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove KOJI_MOUNT_DIR

Browse Source
This commit is contained in:
Trevor Batley 2023-08-31 12:28:25 +10:00
parent 87893cb52d
commit ace13a2d14
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
koji-setup/deploy-koji-builder.sh
View File

@ -19,11 +19,7 @@ useradd -r kojibuilder
usermod -G mock kojibuilder usermod -G mock kojibuilder
# Kojid Configuration Files # Kojid Configuration Files
if [[ "$KOJI_SLAVE_FQDN" = "$KOJI_MASTER_FQDN" ]]; then KOJI_TOP_DIR="$KOJI_DIR"
KOJI_TOP_DIR="$KOJI_DIR"
else
KOJI_TOP_DIR="$KOJI_MOUNT_DIR"
fi
mkdir -p /etc/kojid mkdir -p /etc/kojid
cat > /etc/kojid/kojid.conf <<- EOF cat > /etc/kojid/kojid.conf <<- EOF
[kojid] [kojid]

4
koji-setup/deploy-koji-nfs-client.sh
View File

@ -7,7 +7,7 @@ SCRIPT_DIR="$(dirname "$(realpath "$0")")"
source "$SCRIPT_DIR"/globals.sh source "$SCRIPT_DIR"/globals.sh
source "$SCRIPT_DIR"/parameters.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 KOJI_MOUNT_SERVICE="${KOJI_MOUNT_SERVICE/\//-}".mount
mkdir -p /etc/systemd/system mkdir -p /etc/systemd/system
cat > /etc/systemd/system/"$KOJI_MOUNT_SERVICE" <<- EOF cat > /etc/systemd/system/"$KOJI_MOUNT_SERVICE" <<- EOF
@ -17,7 +17,7 @@ After=network.target
[Mount] [Mount]
What=$KOJI_MASTER_FQDN:$KOJI_DIR What=$KOJI_MASTER_FQDN:$KOJI_DIR
Where=$KOJI_MOUNT_DIR Where=$KOJI_DIR
Type=nfs Type=nfs
Options=defaults,ro Options=defaults,ro

3
koji-setup/parameters.sh
View File

@ -3,8 +3,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
## KOJI RPM BUILD AND TRACKER ## KOJI RPM BUILD AND TRACKER
export KOJI_DIR=/srv/koji export KOJI_DIR=/mnt/koji
export KOJI_MOUNT_DIR=/mnt/koji
export KOJI_MASTER_FQDN="$(hostname -f)" export KOJI_MASTER_FQDN="$(hostname -f)"
# Use master FQDN if build server on master # Use master FQDN if build server on master
#export KOJI_SLAVE_FQDN="$KOJI_MASTER_FQDN" #export KOJI_SLAVE_FQDN="$KOJI_MASTER_FQDN"