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

store allowed scms as parameter

Browse Source
This commit is contained in:
Trevor Batley 2023-11-04 17:13:27 +11:00
parent 553368d350
commit 9fc6e00199
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install-koji-farm.sh
View File

@ -105,10 +105,10 @@ done
HTTPD_USER=apache HTTPD_USER=apache
HTTPD_DOCUMENT_ROOT=/var/www/html HTTPD_DOCUMENT_ROOT=/var/www/html
KOJI_DIR="/mnt/koji" KOJI_DIR="/mnt/koji"
TAG_NAME='smeos10 smecontribs10 smeos11 smecontribs11'
KOJI_PKI_DIR=/etc/pki/koji KOJI_PKI_DIR=/etc/pki/koji
RPM_ARCH="x86_64" RPM_ARCH="x86_64"
KOJID_CAPACITY=16 KOJID_CAPACITY=16
KOJI_ALLOWED_SCMS="src.koozali.org:/*"
SRC_RPM_DIR= SRC_RPM_DIR=
BIN_RPM_DIR= BIN_RPM_DIR=
DEBUG_RPM_DIR= DEBUG_RPM_DIR=
@ -128,8 +128,8 @@ export KOJI_DIR=$KOJI_DIR
export KOJI_HUB_FQDN=$KOJI_HUB_FQDN export KOJI_HUB_FQDN=$KOJI_HUB_FQDN
export KOJI_URL=http://$KOJI_HUB_FQDN export KOJI_URL=http://$KOJI_HUB_FQDN
export KOJI_WEB_URL=http://$KOJI_WEB_FQDN export KOJI_WEB_URL=http://$KOJI_WEB_FQDN
export KOJI_ALLOWED_SCMS=$KOJI_ALLOWED_SCMS
export KOJID_CAPACITY=$KOJID_CAPACITY export KOJID_CAPACITY=$KOJID_CAPACITY
export TAG_NAME='$TAG_NAME'
# Use for koji SSL certificates # Use for koji SSL certificates
export KOJI_PKI_DIR=$KOJI_PKI_DIR export KOJI_PKI_DIR=$KOJI_PKI_DIR
export COUNTRY_CODE='$COUNTRY_CODE' export COUNTRY_CODE='$COUNTRY_CODE'

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

@ -65,7 +65,7 @@ user=$KOJI_BUILD_FQDN
server=$KOJI_URL/kojihub server=$KOJI_URL/kojihub
topurl=$KOJI_URL/kojifiles topurl=$KOJI_URL/kojifiles
use_createrepo_c=True use_createrepo_c=True
allowed_scms=src.koozali.org:/* allowed_scms=$KOJI_ALLOWED_SCMS
cert = $KOJI_PKI_DIR/$KOJI_BUILD_FQDN.pem cert = $KOJI_PKI_DIR/$KOJI_BUILD_FQDN.pem
serverca = $KOJI_PKI_DIR/koji_ca_cert.crt serverca = $KOJI_PKI_DIR/koji_ca_cert.crt
EOF EOF