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

Merge pull request #9417 from Security-Onion-Solutions/2.4/eval

Browse Source 
Fix EVAL mode in 2.4
This commit is contained in:
Doug Burks
2022-12-16 16:39:46 -05:00
committed by GitHub
parent 1b42965a6d 0fa6ca3880
commit c25a828dd2
12 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
salt/common/tools/sbin/so-elastic-agent-gen-installers Normal file → Executable file
View File

0
salt/common/tools/sbin/so-elastic-auth-password-reset Normal file → Executable file
View File

0
salt/common/tools/sbin/so-elastic-fleet-setup Normal file → Executable file
View File

0
salt/common/tools/sbin/so-firewall-minion Normal file → Executable file
View File

0
salt/common/tools/sbin/so-idh-restart Normal file → Executable file
View File

0
salt/common/tools/sbin/so-idh-start Normal file → Executable file
View File

0
salt/common/tools/sbin/so-idh-stop Normal file → Executable file
View File

0
salt/common/tools/sbin/so-status Normal file → Executable file
View File

1
salt/utility/init.sls
View File

@@ -1,4 +1,5 @@
{% from 'allowed_states.map.jinja' import allowed_states %}
{% from 'vars/globals.map.jinja' import GLOBALS %}
{% if sls in allowed_states %}
{% if grains['role'] in ['so-eval', 'so-import'] %}

13
salt/vars/eval.map.jinja Normal file
View File

@@ -0,0 +1,13 @@
{% from 'vars/elasticsearch.map.jinja' import ELASTICSEARCH_GLOBALS %}
{% set ROLE_GLOBALS = {} %}
{% set EVAL_GLOBALS =
[
ELASTICSEARCH_GLOBALS
]
%}
{% for sg in EVAL_GLOBALS %}
{% do salt['defaults.merge'](ROLE_GLOBALS, sg, merge_lists=False, in_place=True) %}
{% endfor %}