From 9fc6e0019904244fd1a31d63e65c1c65a971cacf Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Sat, 4 Nov 2023 17:13:27 +1100 Subject: [PATCH] store allowed scms as parameter --- install-koji-farm.sh | 4 ++-- koji-setup/koji-deploy-builder.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install-koji-farm.sh b/install-koji-farm.sh index f6f7df1..9194730 100644 --- a/install-koji-farm.sh +++ b/install-koji-farm.sh @@ -105,10 +105,10 @@ done HTTPD_USER=apache HTTPD_DOCUMENT_ROOT=/var/www/html KOJI_DIR="/mnt/koji" -TAG_NAME='smeos10 smecontribs10 smeos11 smecontribs11' KOJI_PKI_DIR=/etc/pki/koji RPM_ARCH="x86_64" KOJID_CAPACITY=16 +KOJI_ALLOWED_SCMS="src.koozali.org:/*" SRC_RPM_DIR= BIN_RPM_DIR= DEBUG_RPM_DIR= @@ -128,8 +128,8 @@ export KOJI_DIR=$KOJI_DIR export KOJI_HUB_FQDN=$KOJI_HUB_FQDN export KOJI_URL=http://$KOJI_HUB_FQDN export KOJI_WEB_URL=http://$KOJI_WEB_FQDN +export KOJI_ALLOWED_SCMS=$KOJI_ALLOWED_SCMS export KOJID_CAPACITY=$KOJID_CAPACITY -export TAG_NAME='$TAG_NAME' # Use for koji SSL certificates export KOJI_PKI_DIR=$KOJI_PKI_DIR export COUNTRY_CODE='$COUNTRY_CODE' diff --git a/koji-setup/koji-deploy-builder.sh b/koji-setup/koji-deploy-builder.sh index a28c17a..de3ad26 100755 --- a/koji-setup/koji-deploy-builder.sh +++ b/koji-setup/koji-deploy-builder.sh @@ -65,7 +65,7 @@ user=$KOJI_BUILD_FQDN server=$KOJI_URL/kojihub topurl=$KOJI_URL/kojifiles use_createrepo_c=True -allowed_scms=src.koozali.org:/* +allowed_scms=$KOJI_ALLOWED_SCMS cert = $KOJI_PKI_DIR/$KOJI_BUILD_FQDN.pem serverca = $KOJI_PKI_DIR/koji_ca_cert.crt EOF