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 pull request #4567 from Security-Onion-Solutions/issue/1333

Browse Source 
Issue/1333
This commit is contained in:
Josh Patterson
2021-06-18 16:12:42 -04:00
committed by GitHub
parent 6e7f2107cb c7a58816b6
commit dc1c82f347
3 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,13 @@
{% if salt['pillar.get']('patch:os:schedule_name') %} {% if salt['pillar.get']('patch:os:schedule_name') %}
{% set patch_os_pillar = salt['pillar.get']('patch:os') %} {% if salt['service.status']('salt-minion', True) %}
{% set schedule_name = patch_os_pillar.schedule_name %} {% set patch_os_pillar = salt['pillar.get']('patch:os') %}
{% set splay = patch_os_pillar.get('splay', 300) %} {% set schedule_name = patch_os_pillar.schedule_name %}
{% set splay = patch_os_pillar.get('splay', 300) %}
{% if schedule_name != 'manual' and schedule_name != 'auto' %} {% if schedule_name != 'manual' and schedule_name != 'auto' %}
{% import_yaml "patch/os/schedules/"~schedule_name~".yml" as os_schedule %} {% import_yaml "patch/os/schedules/"~schedule_name~".yml" as os_schedule %}
{% if patch_os_pillar.enabled %} {% if patch_os_pillar.enabled %}
patch_os_schedule: patch_os_schedule:
schedule.present: schedule.present:
@@ -14,28 +15,28 @@ patch_os_schedule:
- job_args: - job_args:
- patch.os - patch.os
- when: - when:
{% for days in os_schedule.patch.os.schedule %} {% for days in os_schedule.patch.os.schedule %}
{% for day, times in days.items() %} {% for day, times in days.items() %}
{% for time in times %} {% for time in times %}
- {{day}} {{time}} - {{day}} {{time}}
{% endfor %}
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
{% endfor %}
- splay: {{splay}} - splay: {{splay}}
- return_job: True - return_job: True
{% else %} {% else %}
disable_patch_os_schedule: disable_patch_os_schedule:
schedule.disabled: schedule.disabled:
- name: patch_os_schedule - name: patch_os_schedule
{% endif %} {% endif %}
{% elif schedule_name == 'auto' %} {% elif schedule_name == 'auto' %}
{% if patch_os_pillar.enabled %} {% if patch_os_pillar.enabled %}
patch_os_schedule: patch_os_schedule:
schedule.present: schedule.present:
@@ -46,22 +47,23 @@ patch_os_schedule:
- splay: {{splay}} - splay: {{splay}}
- return_job: True - return_job: True
{% else %} {% else %}
disable_patch_os_schedule: disable_patch_os_schedule:
schedule.disabled: schedule.disabled:
- name: patch_os_schedule - name: patch_os_schedule
{% endif %} {% endif %}
{% elif schedule_name == 'manual' %} {% elif schedule_name == 'manual' %}
remove_patch_os_schedule: remove_patch_os_schedule:
schedule.absent: schedule.absent:
- name: patch_os_schedule - name: patch_os_schedule
{% endif %} {% endif %}
{% endif %}
{% else %} {% else %}
no_patch_os_schedule_name_set: no_patch_os_schedule_name_set:

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