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

create salt.helper-packages state, use it to install the patch package

Browse Source
This commit is contained in:
m0duspwnens
2021-04-21 18:22:44 -04:00
parent 21077ef26e
commit f5ddb084b6
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/common/init.sls
View File

@@ -95,7 +95,6 @@ commonpkgs:
- python3-mysqldb - python3-mysqldb
- python3-packaging - python3-packaging
- git - git
- patch
heldpackages: heldpackages:
pkg.installed: pkg.installed:
@@ -135,7 +134,6 @@ commonpkgs:
- lvm2 - lvm2
- openssl - openssl
- git - git
- patch
heldpackages: heldpackages:
pkg.installed: pkg.installed:

3
salt/salt/helper-packages.sls Normal file
View File

@@ -0,0 +1,3 @@
patch_package:
pkg.installed:
- name: patch

1
salt/salt/minion.sls
View File

@@ -7,6 +7,7 @@
include: include:
- salt - salt
- salt.helper_packages
- systemd.reload - systemd.reload
{% if INSTALLEDSALTVERSION|string != SALTVERSION|string %} {% if INSTALLEDSALTVERSION|string != SALTVERSION|string %}

15
salt/salt/python3-influxdb.sls
View File

@@ -2,6 +2,9 @@
{% from "salt/map.jinja" import SALT_MODULE_CODE_PATH with context %} {% from "salt/map.jinja" import SALT_MODULE_CODE_PATH with context %}
{% from "salt/map.jinja" import PYTHON3INFLUX with context %} {% from "salt/map.jinja" import PYTHON3INFLUX with context %}
include:
- salt.helper-packages
python3_influxdb: python3_influxdb:
pkg.installed: pkg.installed:
- name: {{ PYTHON3INFLUX }} - name: {{ PYTHON3INFLUX }}
@@ -11,17 +14,23 @@ influxdb_continuous_query.present_patch:
file.patch: file.patch:
- name: {{ SALT_STATE_CODE_PATH }}/influxdb_continuous_query.py - name: {{ SALT_STATE_CODE_PATH }}/influxdb_continuous_query.py
- source: salt://salt/files/influxdb_continuous_query.py.patch - source: salt://salt/files/influxdb_continuous_query.py.patch
- pkg: python3_influxdb - require:
- pkg: python3_influxdb
- pkg: patch_package
#https://github.com/saltstack/salt/issues/59761 #https://github.com/saltstack/salt/issues/59761
influxdb_retention_policy.present_patch: influxdb_retention_policy.present_patch:
file.patch: file.patch:
- name: {{ SALT_STATE_CODE_PATH }}/influxdb_retention_policy.py - name: {{ SALT_STATE_CODE_PATH }}/influxdb_retention_policy.py
- source: salt://salt/files/influxdb_retention_policy.py.patch - source: salt://salt/files/influxdb_retention_policy.py.patch
- pkg: python3_influxdb - require:
- pkg: python3_influxdb
- pkg: patch_package
influxdbmod.py_shard_duration_patch: influxdbmod.py_shard_duration_patch:
file.patch: file.patch:
- name: {{ SALT_MODULE_CODE_PATH }}/influxdbmod.py - name: {{ SALT_MODULE_CODE_PATH }}/influxdbmod.py
- source: salt://salt/files/influxdbmod.py.patch - source: salt://salt/files/influxdbmod.py.patch
- pkg: python3_influxdb - require:
- pkg: python3_influxdb
- pkg: patch_package