Merge pull request #11929 from Security-Onion-Solutions/hf_soup

avoid exiting salt when ca state applied in post for 2.4.30
This commit is contained in:
Josh Patterson
2023-12-04 11:46:27 -05:00
committed by GitHub

View File

@@ -450,7 +450,10 @@ post_to_2.4.20() {
post_to_2.4.30() { post_to_2.4.30() {
echo "Regenerating Elastic Agent Installers" echo "Regenerating Elastic Agent Installers"
/sbin/so-elastic-agent-gen-installers /sbin/so-elastic-agent-gen-installers
# there is an occasional error with this state: pki_public_ca_crt: TypeError: list indices must be integers or slices, not str
set +e
salt-call state.apply ca queue=True salt-call state.apply ca queue=True
set -e
stop_salt_minion stop_salt_minion
mv /etc/pki/managerssl.crt /etc/pki/managerssl.crt.old mv /etc/pki/managerssl.crt /etc/pki/managerssl.crt.old
mv /etc/pki/managerssl.key /etc/pki/managerssl.key.old mv /etc/pki/managerssl.key /etc/pki/managerssl.key.old