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

comments in parameters re: master as builder

Browse Source
This commit is contained in:
Trevor Batley 2023-08-31 09:58:42 +10:00
parent 0eef482c7b
commit 6bd3adf042
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
koji-setup/deploy-koji.sh
View File

@ -100,12 +100,6 @@ echo 01 > "$KOJI_PKI_DIR"/serial
openssl genrsa -out "$KOJI_PKI_DIR"/private/koji_ca_cert.key 2048 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 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 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
# Generate the koji component certificates and the admin certificate and generate a PKCS12 user certificate (for web browser) # 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" cp "$SCRIPT_DIR"/gencert.sh "$KOJI_PKI_DIR"
@ -166,7 +160,6 @@ sudo -u koji psql -c "insert into users (name, status, usertype) values ('kojiad
# Give yourself admin permissions # Give yourself admin permissions
sudo -u koji psql -c "insert into user_perms (user_id, perm_id, creator_id) values (1, 1, 1);" sudo -u koji psql -c "insert into user_perms (user_id, perm_id, creator_id) values (1, 1, 1);"
## KOJI CONFIGURATION FILES ## KOJI CONFIGURATION FILES
# Koji Hub # Koji Hub
mkdir -p /etc/koji-hub mkdir -p /etc/koji-hub

6
koji-setup/parameters.sh
View File

@ -6,6 +6,9 @@
export KOJI_DIR=/srv/koji export KOJI_DIR=/srv/koji
export KOJI_MOUNT_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
#export KOJI_SLAVE_FQDN="$KOJI_MASTER_FQDN"
# Build server FQDN if different from master
export KOJI_SLAVE_FQDN="kojibuild1.koozali.org" export KOJI_SLAVE_FQDN="kojibuild1.koozali.org"
export KOJI_URL=http://"$KOJI_MASTER_FQDN" export KOJI_URL=http://"$KOJI_MASTER_FQDN"
export KOJID_CAPACITY=16 export KOJID_CAPACITY=16
@ -36,6 +39,3 @@ export GITOLITE_PUB_KEY=''
## UPSTREAMS CACHE ## UPSTREAMS CACHE
export UPSTREAMS_DIR=/srv/upstreams export UPSTREAMS_DIR=/srv/upstreams
## MASH RPMS
export MASH_DIR=/srv/mash
export MASH_SCRIPT_DIR=/usr/local/bin