From 87dc8384f9ecfcc0fabe643af8db3bb93cc5d41c Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Thu, 9 Sep 2021 11:16:24 -0700 Subject: [PATCH] Remove 'ca' option from configs This option was officially deprecated in koji 1.22.0 and removed in koji 1.24.0. It was internally deprecated a while before 1.22.0, and I've confirmed that removing the config for koji 1.21.2 -- the current version in Clear -- is a no-op. (Note that removing the 'ca' option from the client config is optional, since unknown options in that config appear to be ignored. But for completeness, I removed it there as well.) Signed-off-by: Patrick McCarty --- koji-setup/deploy-koji-builder.sh | 1 - koji-setup/deploy-koji.sh | 2 -- 2 files changed, 3 deletions(-) diff --git a/koji-setup/deploy-koji-builder.sh b/koji-setup/deploy-koji-builder.sh index b68195a..3883d91 100755 --- a/koji-setup/deploy-koji-builder.sh +++ b/koji-setup/deploy-koji-builder.sh @@ -41,7 +41,6 @@ topurl=$KOJI_URL/kojifiles use_createrepo_c=True allowed_scms=$GIT_FQDN:/packages/* cert = $KOJI_PKI_DIR/$KOJI_SLAVE_FQDN.pem -ca = $KOJI_PKI_DIR/koji_ca_cert.crt serverca = $KOJI_PKI_DIR/koji_ca_cert.crt EOF diff --git a/koji-setup/deploy-koji.sh b/koji-setup/deploy-koji.sh index 107a07a..b354f97 100755 --- a/koji-setup/deploy-koji.sh +++ b/koji-setup/deploy-koji.sh @@ -242,7 +242,6 @@ weburl = $KOJI_URL/koji topurl = $KOJI_URL/kojifiles topdir = $KOJI_DIR cert = ~/.koji/client.crt -ca = ~/.koji/clientca.crt serverca = ~/.koji/serverca.crt anon_retry = true EOF @@ -344,7 +343,6 @@ topdir=$KOJI_DIR logfile=/var/log/kojira.log with_src=no cert = $KOJI_PKI_DIR/kojira.pem -ca = $KOJI_PKI_DIR/koji_ca_cert.crt serverca = $KOJI_PKI_DIR/koji_ca_cert.crt EOF