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

add in allowed scms as parameter

Browse Source
This commit is contained in:
Trevor Batley 2023-11-08 09:33:53 +11:00
parent a8f05a020e
commit 91d0753de7
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install-koji-farm.sh
View File

@ -4,16 +4,21 @@ set -e
DEBUG= DEBUG=
KOJI_HUB_FQDN="$(hostname -f)" KOJI_HUB_FQDN="$(hostname -f)"
KOJI_WEB_FQDN=$KOJI_HUB_FQDN KOJI_WEB_FQDN=$KOJI_HUB_FQDN
KOJI_ALLOWED_SCMS="src.koozali.org:/*"
KOJI_BUILD_FQDNS= KOJI_BUILD_FQDNS=
for param in "$@"; do for param in "$@"; do
if [ $param ] ; then if [ $param ] ; then
case $param in case $param in
-h | --help )
echo "install-koji-farm.sh [web=<web FQDN> | build=<builder FQDN> | scm=<scm:/*> | debug]" ;;
debug ) debug )
DEBUG="debug" ;; DEBUG="debug" ;;
web=* ) web=* )
KOJI_WEB_FQDN=${param#*=} ;; KOJI_WEB_FQDN=${param#*=} ;;
build=* ) build=* )
KOJI_BUILD_FQDNS=$KOJI_BUILD_FQDNS" "${param#*=} ;; KOJI_BUILD_FQDNS=$KOJI_BUILD_FQDNS" "${param#*=} ;;
scm=* )
KOJI_ALLOWED_SCMS=$KOJI_ALLOWED_SCMS" "${param#*=} ;;
esac esac
else else
break break
@ -108,7 +113,6 @@ KOJI_DIR="/mnt/koji"
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=

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=$KOJI_ALLOWED_SCMS allowed_scms=:/packages/* $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
mock_bootstrap_image=False mock_bootstrap_image=False