CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 09:12:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13171 from Security-Onion-Solutions/jertel/yaml

Browse Source 
correct placement of error check override
This commit is contained in:
Jason Ertel
2024-06-08 08:21:20 -04:00
committed by GitHub
parent dea786abfa f1638faa3a
commit 7ad6baf483
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
salt/manager/tools/sbin/soup
View File

@@ -349,11 +349,11 @@ masterunlock() {
phases_pillar_2_4_80() { phases_pillar_2_4_80() {
echo "Checking if pillar value: elasticsearch.index_settings.global_overrides.index_template.phases exists" echo "Checking if pillar value: elasticsearch.index_settings.global_overrides.index_template.phases exists"
set +e
PHASES=$(so-yaml.py get /opt/so/saltstack/local/pillar/elasticsearch/soc_elasticsearch.sls elasticsearch.index_settings.global_overrides.index_template.phases) PHASES=$(so-yaml.py get /opt/so/saltstack/local/pillar/elasticsearch/soc_elasticsearch.sls elasticsearch.index_settings.global_overrides.index_template.phases)
case $? in case $? in
0) 0)
so-yaml.py remove /opt/so/saltstack/local/pillar/elasticsearch/soc_elasticsearch.sls elasticsearch.index_settings.global_overrides.index_template.phases so-yaml.py remove /opt/so/saltstack/local/pillar/elasticsearch/soc_elasticsearch.sls elasticsearch.index_settings.global_overrides.index_template.phases
set +e
read -r -d '' msg <<- EOF read -r -d '' msg <<- EOF
Found elasticsearch.index_settings.global_overrides.index_template.phases was set to: Found elasticsearch.index_settings.global_overrides.index_template.phases was set to:
${PHASES} ${PHASES}
@@ -363,11 +363,11 @@ To set policies, navigate to the SOC Grid Configuration UI at elasticsearch.inde
A backup of all pillar files was saved to /nsm/backup/ A backup of all pillar files was saved to /nsm/backup/
EOF EOF
FINAL_MESSAGE_QUEUE+=("$msg") FINAL_MESSAGE_QUEUE+=("$msg")
set -e
;; ;;
2) echo "Pillar elasticsearch.index_settings.global_overrides.index_template.phases does not exist. No action taken." ;; 2) echo "Pillar elasticsearch.index_settings.global_overrides.index_template.phases does not exist. No action taken." ;;
*) echo "so-yaml.py returned something other than 0 or 2 exit code" ;; # we shouldn't see this *) echo "so-yaml.py returned something other than 0 or 2 exit code" ;; # we shouldn't see this
esac esac
set -e
} }
preupgrade_changes() { preupgrade_changes() {