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

update so-common lookup_salt_value to accept local option. soup get minion id from grains with local option

Browse Source
This commit is contained in:
m0duspwnens
2022-02-28 12:15:23 -05:00
parent a9caef9596
commit 278235b0ca
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
salt/common/tools/sbin/so-common
View File

@@ -249,6 +249,7 @@ lookup_salt_value() {
group=$2 group=$2
kind=$3 kind=$3
output=${4:-newline_values_only} output=${4:-newline_values_only}
local=$5
if [ -z "$kind" ]; then if [ -z "$kind" ]; then
kind=pillar kind=pillar
@@ -258,7 +259,11 @@ lookup_salt_value() {
group=${group}: group=${group}:
fi fi
salt-call --no-color ${kind}.get ${group}${key} --out=${output} if [[ "$local" != "--local" ]] || [[ "$local" != "local" ]]
local=""
fi
salt-call --no-color ${kind}.get ${group}${key} --out=${output} ${local}
} }
lookup_pillar() { lookup_pillar() {

2
salt/common/tools/sbin/soup
View File

@@ -255,7 +255,7 @@ check_log_size_limit() {
fi fi
else else
local minion_id local minion_id
minion_id=$(lookup_salt_value "id" "" "grains") minion_id=$(lookup_salt_value "id" "" "grains" "local")
local minion_arr local minion_arr
IFS='_' read -ra minion_arr <<< "$minion_id" IFS='_' read -ra minion_arr <<< "$minion_id"