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 remote-tracking branch 'origin/2.4/dev' into vlb2

Browse Source
This commit is contained in:
Josh Patterson
2025-03-27 15:34:39 -04:00
parent f9bf4e4130 3e10c95b7b
commit 4165b33995
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
salt/top.sls
View File

@@ -21,17 +21,31 @@ base:
- schedule - schedule
- logrotate - logrotate
'I@node_data:False and ( *_manager* or *_eval or *_import or *_standalone )': # manager node on proper salt version with empty node_data pillar
'( *_manager* or *_eval or *_import or *_standalone ) and G@saltversion:{{saltversion}} and I@node_data:False':
- match: compound - match: compound
- salt.minion - salt.minion
- salt.master.mine_update_highstate - salt.master.mine_update_highstate
'not G@saltversion:{{saltversion}} and not I@node_data:False': 'not G@saltversion:{{saltversion}}':
- match: compound - match: compound
- salt.minion-state-apply-test - salt.minion-state-apply-test
- salt.minion - salt.minion
'* and G@saltversion:{{saltversion}} and not I@node_data:False': # all non managers on the proper salt version
'not ( *_manager* or *_eval or *_import or *_standalone ) and G@saltversion:{{saltversion}}':
- match: compound
- salt.minion
- patch.os.schedule
- motd
- salt.minion-check
- salt.lasthighstate
- common
- docker
- docker_clean
# all managers on proper salt version node_data pillar not empty
'( *_manager* or *_eval or *_import or *_standalone ) and G@saltversion:{{saltversion}} and not I@node_data:False':
- match: compound - match: compound
- salt.minion - salt.minion
- patch.os.schedule - patch.os.schedule