From e958246457f241f4f586770d50c150e35ec7fc36 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 13 Nov 2020 19:34:17 -0500 Subject: [PATCH] touch file at start of highstate, just kill salt dont systemctl stop it https://github.com/Security-Onion-Solutions/securityonion/issues/1831 --- salt/common/tools/sbin/so-salt-minion-check | 4 +--- salt/salt/minion-check.sls | 3 +++ salt/salt/minion-state-apply-test.sls | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/salt/common/tools/sbin/so-salt-minion-check b/salt/common/tools/sbin/so-salt-minion-check index 74718e192..84f72bb72 100644 --- a/salt/common/tools/sbin/so-salt-minion-check +++ b/salt/common/tools/sbin/so-salt-minion-check @@ -92,9 +92,7 @@ if [ $CURRENT_TIME -ge $((SYSTEM_START_TIME+$UPTIME_REQ)) ]; then log "last highstate completed at `date -d @$LAST_HIGHSTATE_END`" I log "checking if any jobs are running" I logCmd "salt-call --local saltutil.running" I - log "stopping salt-minion service" I - logCmd "timeout -k10 -s9 120 systemctl stop salt-minion" I - log "killing any leftover salt-minion processes" I + log "killing all salt-minion processes" I logCmd "pkill -9 -ef /usr/bin/salt-minion" I log "starting salt-minion service" I logCmd "systemctl start salt-minion" I diff --git a/salt/salt/minion-check.sls b/salt/salt/minion-check.sls index d8dc4c418..e8a0c2639 100644 --- a/salt/salt/minion-check.sls +++ b/salt/salt/minion-check.sls @@ -1,3 +1,6 @@ +include: + - salt.minion-state-apply-test + state-apply-test: schedule.present: - name: salt-minion-state-apply-test diff --git a/salt/salt/minion-state-apply-test.sls b/salt/salt/minion-state-apply-test.sls index 4da77419b..9d7e90e63 100644 --- a/salt/salt/minion-state-apply-test.sls +++ b/salt/salt/minion-state-apply-test.sls @@ -1,3 +1,4 @@ minion-state-apply-test: file.touch: - - name: /opt/so/log/salt/state-apply-test \ No newline at end of file + - name: /opt/so/log/salt/state-apply-test + - order: first \ No newline at end of file