From 8aa8bd0b49b22dd65ba4058b24d4a0d7d26789a0 Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Wed, 30 Aug 2023 17:35:00 +1000 Subject: [PATCH] fix missing software --- koji-setup/deploy-koji.sh | 14 +++++++------- koji-setup/parameters.sh | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/koji-setup/deploy-koji.sh b/koji-setup/deploy-koji.sh index 86d5e89..465d78e 100755 --- a/koji-setup/deploy-koji.sh +++ b/koji-setup/deploy-koji.sh @@ -10,7 +10,7 @@ source "$SCRIPT_DIR"/parameters.sh # Install all the required packages (some live in the epel repo, so we need to install that too) dnf config-manager --set-enabled powertools dnf install epel-release -dnf install koji-hub mod_ssl koji koji-web koji-utils +dnf install koji-hub mod_ssl koji koji-web koji-utils policycoreutils-python-utils dnf module enable postgresql:10 dnf install postgresql-server @@ -100,12 +100,12 @@ echo 01 > "$KOJI_PKI_DIR"/serial openssl genrsa -out "$KOJI_PKI_DIR"/private/koji_ca_cert.key 2048 openssl req -subj "/C=$COUNTRY_CODE/ST=$STATE/L=$LOCATION/O=$ORGANIZATION/OU=koji_ca/CN=$KOJI_MASTER_FQDN" -config "$KOJI_PKI_DIR"/ssl.cnf -new -x509 -days 3650 -key "$KOJI_PKI_DIR"/private/koji_ca_cert.key -out "$KOJI_PKI_DIR"/koji_ca_cert.crt -extensions v3_ca mkdir -p /etc/ca-certs/trusted -cp -a "$KOJI_PKI_DIR"/koji_ca_cert.crt /etc/ca-certs/trusted -while true; do - if clrtrust generate; then - break - fi -done +#cp -a "$KOJI_PKI_DIR"/koji_ca_cert.crt /etc/ca-certs/trusted +#while true; do +# if clrtrust generate; then +# break +# fi +#done # Generate the koji component certificates and the admin certificate and generate a PKCS12 user certificate (for web browser) cp "$SCRIPT_DIR"/gencert.sh "$KOJI_PKI_DIR" diff --git a/koji-setup/parameters.sh b/koji-setup/parameters.sh index 7f4be2f..5a80a85 100644 --- a/koji-setup/parameters.sh +++ b/koji-setup/parameters.sh @@ -25,7 +25,7 @@ export DEBUG_RPM_DIR= export EXTERNAL_REPO=http://mirrorlist.centos.org/releases/10/smeos/ ## POSTGRESQL DATABASE -export POSTGRES_DIR=/srv/pgsql +export POSTGRES_DIR=/var/lib/pgsql ## GIT REPOSITORIES export GIT_DIR=