Skip to content

Commit

Permalink
Drop redundant update-ca-trust enable step
Browse files Browse the repository at this point in the history
On EL 7 & 8 the argument is ignored, so it effectively ran twice. On EL
9 since ca-certificates-0:2024.2.69_v8.0.303-91.3.el9 it does check the
argument and changes behavior. The on 91.3 it hard fails on enable while
91.4 yields a deprecation warning. It still effectively runs twice.

This drops the redundant step because it only needs to extract after the
new CA has been added.

It makes the extract step explicit, where it previously was implicit.
  • Loading branch information
ekohl committed Aug 21, 2024
1 parent b1e6e3e commit 53187d9
Showing 1 changed file with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,8 @@ def script_template
# also add the katello ca cert to the system wide ca cert store
if [ -d $CA_TRUST_ANCHORS ]; then
update-ca-trust enable
cp $CERT_DIR/$KATELLO_SERVER_CA_CERT $CA_TRUST_ANCHORS
update-ca-trust
update-ca-trust extract
fi
# restart yggdrasild if it is installed and running
Expand Down

0 comments on commit 53187d9

Please sign in to comment.