CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-07 09:42:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Grain

Browse Source
This commit is contained in:
Mike Reeves
2021-09-20 18:12:18 -04:00
parent 50b78681f2
commit 481ffb1cda
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
salt/common/init.sls
View File

@@ -107,12 +107,12 @@ commonpkgs:
heldpackages: heldpackages:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
{% if grains['codename'] == 'bionic' %} {% if grains['oscodename'] == 'bionic' %}
- containerd.io: 1.4.4-1 - containerd.io: 1.4.4-1
- docker-ce: 5:20.10.5~3-0~ubuntu-bionic - docker-ce: 5:20.10.5~3-0~ubuntu-bionic
- docker-ce-cli: 5:20.10.5~3-0~ubuntu-bionic - docker-ce-cli: 5:20.10.5~3-0~ubuntu-bionic
- docker-ce-rootless-extras: 5:20.10.5~3-0~ubuntu-bionic - docker-ce-rootless-extras: 5:20.10.5~3-0~ubuntu-bionic
{% elif grains['codename'] == 'focal' %} {% elif grains['oscodename'] == 'focal' %}
- containerd.io: 1.4.9-1 - containerd.io: 1.4.9-1
- docker-ce: 5:20.10.8~3-0~ubuntu-focal - docker-ce: 5:20.10.8~3-0~ubuntu-focal
- docker-ce-cli: 5:20.10.5~3-0~ubuntu-focal - docker-ce-cli: 5:20.10.5~3-0~ubuntu-focal

4
salt/mysql/init.sls
View File

@@ -22,9 +22,9 @@ mysqlpkgs:
- skip_suggestions: False - skip_suggestions: False
- pkgs: - pkgs:
{% if grains['os'] != 'CentOS' %} {% if grains['os'] != 'CentOS' %}
{% if grains['codename'] == 'bionic' %} {% if grains['oscodename'] == 'bionic' %}
- python3-mysqldb - python3-mysqldb
{% elif grains['codename'] == 'focal' %} {% elif grains['oscodename'] == 'focal' %}
- python3-mysqldb - python3-mysqldb
{% endif %} {% endif %}
{% else %} {% else %}

4
salt/salt/init.sls
View File

@@ -3,9 +3,9 @@ saltpymodules:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- python-docker - python-docker
{% if grains['codename'] == 'bionic' %} {% if grains['oscodename'] == 'bionic' %}
- python-m2crypto - python-m2crypto
{% elif grains['codename'] == 'focal' %} {% elif grains['oscodename'] == 'focal' %}
- python3-m2crypto - python3-m2crypto
{% endif %} {% endif %}
{% endif %} {% endif %}

4
salt/ssl/init.sls
View File

@@ -42,9 +42,9 @@ m2cryptopkgs:
pkg.installed: pkg.installed:
- skip_suggestions: False - skip_suggestions: False
- pkgs: - pkgs:
{% if grains['codename'] == 'bionic' %} {% if grains['oscodename'] == 'bionic' %}
- python-m2crypto - python-m2crypto
{% elif grains['codename'] == 'focal' %} {% elif grains['oscodename'] == 'focal' %}
- python3-m2crypto - python3-m2crypto
{% endif %} {% endif %}
{% endif %} {% endif %}