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

support installing via pip for ubuntu

Browse Source
This commit is contained in:
m0duspwnens
2021-04-29 13:22:31 -04:00
parent 93ee96b1cd
commit 450a01784b
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
salt/salt/map.jinja
View File

@@ -7,7 +7,9 @@
{% set SALTPACKAGES = ['salt-common', 'salt-master', 'salt-minion'] %} {% set SALTPACKAGES = ['salt-common', 'salt-master', 'salt-minion'] %}
{% set SALT_STATE_CODE_PATH = '/usr/lib/python3/dist-packages/salt/states' %} {% set SALT_STATE_CODE_PATH = '/usr/lib/python3/dist-packages/salt/states' %}
{% set SALT_MODULE_CODE_PATH = '/usr/lib/python3/dist-packages/salt/modules' %} {% set SALT_MODULE_CODE_PATH = '/usr/lib/python3/dist-packages/salt/modules' %}
{% set PYTHON3INFLUX= 'python3-influxdb' %} {% set PYTHON3INFLUX= 'influxdb == 5.3.1' %}
{% set PYTHON3INFLUXDEPS= ['certifi', 'chardet', 'dateutil', 'pytz', 'requests']
{% set PYTHONINSTALLER = 'pip' %}
{% else %} {% else %}
{% set SPLITCHAR = '-' %} {% set SPLITCHAR = '-' %}
{% set SALTNOTHELD = salt['cmd.run']('yum versionlock list | grep -q salt ; echo $?', python_shell=True) %} {% set SALTNOTHELD = salt['cmd.run']('yum versionlock list | grep -q salt ; echo $?', python_shell=True) %}
@@ -15,7 +17,8 @@
{% set SALT_STATE_CODE_PATH = '/usr/lib/python3.6/site-packages/salt/states' %} {% 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' %} {% set SALT_MODULE_CODE_PATH = '/usr/lib/python3.6/site-packages/salt/modules' %}
{% set PYTHON3INFLUX= 'securityonion-python3-influxdb' %} {% set PYTHON3INFLUX= 'securityonion-python3-influxdb' %}
{% set PYTHON3INFLUXDEPS= ['python36-certifi', 'python36-chardet', 'python36-dateutil', 'python36-pytz', 'python36-requests'] %} {% set PYTHON3INFLUXDEPS= ['python36-certifi', 'python36-chardet', 'python36-dateutil', 'python36-pytz', 'python36-requests']
{% set PYTHONINSTALLER = 'pkg' %}
{% endif %} {% endif %}
{% set INSTALLEDSALTVERSION = salt['pkg.version']('salt-minion').split(SPLITCHAR)[0] %} {% set INSTALLEDSALTVERSION = salt['pkg.version']('salt-minion').split(SPLITCHAR)[0] %}

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

@@ -2,16 +2,19 @@
{% 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 %}
{% from "salt/map.jinja" import PYTHON3INFLUXDEPS with context %} {% from "salt/map.jinja" import PYTHON3INFLUXDEPS with context %}
{% from "salt/map.jinja" import PYTHONINSTALLER with context %}
include: include:
- salt.helper-packages - salt.helper-packages
{#
python3_influxdb_dependencies: python3_influxdb_dependencies:
pkg.installed: {{PYTHONINSTALLER}}.installed:
- pkgs: {{ PYTHON3INFLUXDEPS }} - pkgs: {{ PYTHON3INFLUXDEPS }}
#}
python3_influxdb: python3_influxdb:
pkg.installed: {{PYTHONINSTALLER}}.installed:
- name: {{ PYTHON3INFLUX }} - name: {{ PYTHON3INFLUX }}
#https://github.com/saltstack/salt/issues/59766 #https://github.com/saltstack/salt/issues/59766
@@ -39,3 +42,4 @@ influxdbmod.py_shard_duration_patch:
- require: - require:
- pkg: python3_influxdb - pkg: python3_influxdb
- pkg: patch_package - pkg: patch_package
- reload_modules: True