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

handle different paths for salt states/modules based on os

Browse Source
This commit is contained in:
m0duspwnens
2021-04-21 09:52:22 -04:00
parent d792c65ce3
commit af86a9dac0
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
salt/salt/map.jinja
View File

@@ -4,9 +4,13 @@
{% if grains.os == 'Ubuntu' %} {% if grains.os == 'Ubuntu' %}
{% set SPLITCHAR = '+' %} {% set SPLITCHAR = '+' %}
{% set SALTNOTHELD = salt['cmd.run']('apt-mark showhold | grep salt-* ; echo $?', python_shell=True) %} {% set SALTNOTHELD = salt['cmd.run']('apt-mark showhold | grep salt-* ; echo $?', python_shell=True) %}
{% set SALT_STATE_CODE_PATH = '/usr/lib/python3/dist-packages/salt/states' %}
{% set SALT_MODULE_CODE_PATH = '/usr/lib/python3/dist-packages/salt/modules' %}
{% else %} {% else %}
{% set SPLITCHAR = '-' %} {% set SPLITCHAR = '-' %}
{% set SALTNOTHELD = salt['cmd.run']('yum versionlock list | grep salt-* ; echo $?', python_shell=True) %} {% set SALTNOTHELD = salt['cmd.run']('yum versionlock list | grep salt-* ; echo $?', python_shell=True) %}
{% set SALT_STATE_CODE_PATH = '/usr/lib/python3.6/site-packages/salt/states' %}
{% set SALT_MODULE_CODE_PATH = '/usr/lib/python3.6/site-packages/salt/modules' %}
{% endif %} {% endif %}
{% set INSTALLEDSALTVERSION = salt['pkg.version']('salt-minion').split(SPLITCHAR)[0] %} {% set INSTALLEDSALTVERSION = salt['pkg.version']('salt-minion').split(SPLITCHAR)[0] %}

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

@@ -1,3 +1,6 @@
{% from "salt/map.jinja" import SALT_STATE_CODE_PATH with context %}
{% from "salt/map.jinja" import SALT_MODULE_CODE_PATH with context %}
python3_influxdb: python3_influxdb:
pkg.installed: pkg.installed:
- name: python3-influxdb - name: python3-influxdb
@@ -5,19 +8,19 @@ python3_influxdb:
#https://github.com/saltstack/salt/issues/59766 #https://github.com/saltstack/salt/issues/59766
influxdb_continuous_query.present_patch: influxdb_continuous_query.present_patch:
file.patch: file.patch:
- name: /usr/lib/python3.6/site-packages/salt/states/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 - pkg: python3_influxdb
#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: /usr/lib/python3.6/site-packages/salt/states/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 - pkg: python3_influxdb
influxdbmod.py_shard_duration_patch: influxdbmod.py_shard_duration_patch:
file.patch: file.patch:
- name: /usr/lib/python3.6/site-packages/salt/modules/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 - pkg: python3_influxdb