From 7a664ab8f7459e0e990d6cdb9a2d7650042eeeb8 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 2 Dec 2021 10:02:26 -0500 Subject: [PATCH] more error proof up_to_2.3.90 function --- salt/common/tools/sbin/soup | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 62168fa94..e26cf2de7 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -611,11 +611,17 @@ up_to_2.3.90() { done # Create Endgame Hostgroup - so-firewall addhostgroup endgame + echo "Adding endgame hostgroup with so-firewall" + if so-firewall addhostgroup endgame 2>&1 | grep -q 'Already exists'; then + echo 'endgame hostgroup already exists' + else + echo 'endgame hostgroup added' + fi # Force influx to generate a new cert - mv -v /etc/pki/influxdb.crt /etc/pki/influxdb.crt.2390upgrade - mv -v /etc/pki/influxdb.key /etc/pki/influxdb.key.2390upgrade + echo "Moving influxdb.crt and influxdb.key to generate new certs" + mv -vf /etc/pki/influxdb.crt /etc/pki/influxdb.crt.2390upgrade + mv -vf /etc/pki/influxdb.key /etc/pki/influxdb.key.2390upgrade # remove old common ingest pipeline in default rm -vf /opt/so/saltstack/default/salt/elasticsearch/files/ingest/common