Merge pull request #4567 from Security-Onion-Solutions/issue/1333

Issue/1333
This commit is contained in:
Josh Patterson
2021-06-18 16:12:42 -04:00
committed by GitHub
3 changed files with 26 additions and 20 deletions

View File

@@ -1,4 +1,5 @@
{% if salt['pillar.get']('patch:os:schedule_name') %} {% if salt['pillar.get']('patch:os:schedule_name') %}
{% if 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) %}
@@ -62,6 +63,7 @@ remove_patch_os_schedule:
{% endif %} {% endif %}
{% endif %}
{% else %} {% else %}
no_patch_os_schedule_name_set: no_patch_os_schedule_name_set:

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 %}

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 %}