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

if the salt-minion service isnt running when the state is rendered, dont try to apply schedule - https://github.com/Security-Onion-Solutions/securityonion/issues/1333

Browse Source
This commit is contained in:
m0duspwnens
2021-06-18 14:56:01 -04:00
parent 558a90aaf8
commit 48c3cb4816
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/patch/os/schedule.sls
View File

@@ -1,4 +1,4 @@
{% if salt['pillar.get']('patch:os:schedule_name') %} {% if salt['pillar.get']('patch:os:schedule_name') and salt['service.status']('salt-minion', True) %}
{% set patch_os_pillar = salt['pillar.get']('patch:os') %} {% set patch_os_pillar = salt['pillar.get']('patch:os') %}
{% set schedule_name = patch_os_pillar.schedule_name %} {% set schedule_name = patch_os_pillar.schedule_name %}
{% set splay = patch_os_pillar.get('splay', 300) %} {% set splay = patch_os_pillar.get('splay', 300) %}

2
salt/salt/minion-check.sls
View File

@@ -1,6 +1,7 @@
include: include:
- salt.minion-state-apply-test - salt.minion-state-apply-test
{% if salt['service.status']('salt-minion', True) %}
state-apply-test: state-apply-test:
schedule.present: schedule.present:
- name: salt-minion-state-apply-test - name: salt-minion-state-apply-test
@@ -17,3 +18,4 @@ state-apply-test:
- identifier: so-salt-minion-check - identifier: so-salt-minion-check
- user: root - user: root
- minute: '*/5' - minute: '*/5'
{% endif %}

2
salt/schedule.sls
View File

@@ -1,5 +1,7 @@
{% if salt['service.status']('salt-minion', True) %}
schedule: schedule:
schedule.present: schedule.present:
- function: state.highstate - function: state.highstate
- minutes: 15 - minutes: 15
- maxrunning: 1 - maxrunning: 1
{% endif %}