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

redirect and throw in bg

Browse Source
This commit is contained in:
m0duspwnens
2024-05-03 14:54:44 -04:00
parent 3d4fd59a15
commit bdf1b45a07
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/manager/tools/sbin/so-minion
View File

@@ -605,7 +605,7 @@ function updateMineAndApplyStates() {
# calls so-common and set_minionid sets MINIONID to local minion id # calls so-common and set_minionid sets MINIONID to local minion id
set_minionid set_minionid
# $MINIONID is the minion id of the manager and $MINION_ID is the target node or the node being configured # $MINIONID is the minion id of the manager and $MINION_ID is the target node or the node being configured
salt-run state.orch orch.deploy_newnode pillar="{'setup': {'manager': $MINIONID, 'newnode': $MINION_ID }}" salt-run state.orch orch.deploy_newnode pillar="{'setup': {'manager': $MINIONID, 'newnode': $MINION_ID }}" > /dev/null 2>&1 &
} }
function setupMinionFiles() { function setupMinionFiles() {

15
salt/orch/deploy_newnode.sls
View File

@@ -21,9 +21,6 @@ manager_run_es_soc:
- elasticsearch - elasticsearch
- soc - soc
- queue: True - queue: True
- retry:
attempts: 3
interval: 60
- require: - require:
- salt: {{NEWNODE}}_update_mine - salt: {{NEWNODE}}_update_mine
{% endif %} {% endif %}
@@ -33,15 +30,3 @@ manager_run_es_soc:
- tgt: {{ NEWNODE }} - tgt: {{ NEWNODE }}
- highstate: True - highstate: True
- queue: True - queue: True
- retry:
attempts: 5
interval: 60
{{NEWNODE}}_set_highstate_cron:
salt.state:
- tgt: {{ NEWNODE }}
- sls:
- setup.highstate_cron
- queue: True
- onfail:
- salt: {{NEWNODE}}_run_highstate