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

rework common init.sls

Browse Source
This commit is contained in:
Mike Reeves
2020-05-26 11:21:59 -04:00
parent 31b3563fb3
commit 87407c9ace
1 changed files with 31 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
salt/common/init.sls
View File

@@ -38,11 +38,11 @@ epel:
{% endif %}
# Install common packages
{% if grains['os'] != 'CentOS' %}
commonpkgs:
pkg.installed:
- skip_suggestions: True
- pkgs:
{% if grains['os'] != 'CentOS' %}
- apache2-utils
- wget
- jq
@@ -61,23 +61,19 @@ commonpkgs:
- python3-dateutil
- python3-m2crypto
- python3-mysqldb
- salt-minion: 2019.2.5+ds-1
- hold: True
- update_holds: True
{% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' or grains['role'] == 'so-helix' or grains['role'] == 'so-mastersearch' or grains['role'] == 'so-standalone' %}
- salt-master: 2019.2.5+ds-1
- hold: True
- update_holds: True
heldpackages:
pkg.installed:
- pkgs:
- containerd.io: 1.2.13-2
- hold: True
- update_holds: True
- docker-ce: 5:19.03.9~3-0~ubuntu-bionic
- hold: True
- update_holds: True
{% endif %}
- containerd.io
- docker-ce
{% else %}
commonpkgs:
pkg.installed:
- skip_suggestions: True
- pkgs:
- wget
- bind-utils
- jq
@@ -87,7 +83,7 @@ commonpkgs:
- curl
- sqlite
- argon2
- maridb-devel
- mariadb-devel
- nmap-ncat
- python3
- python36-docker
@@ -98,21 +94,15 @@ commonpkgs:
- device-mapper-persistent-data
- lvm2
- openssl
- salt-minion: 2019.2.5.el7
- hold: True
- update_holds: True
{% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' or grains['role'] == 'so-helix' or grains['role'] == 'so-mastersearch' or grains['role'] == 'so-standalone' %}
- salt-master: 2019.2.5.el7
heldpackages:
pkg.installed:
- pkgs:
- containerd.io: 1.2.13-3.2.el7
- docker-ce: 3:19.03.9-3.el7
- hold: True
- update_holds: True
{% endif %}
- containerd.io: 1.2.6-3.el7
- hold: True
- update_holds: True
- docker-ce: 19.03.9-3.el7
- hold: True
- update_holds: True
{% endif %}%}
# Always keep these packages up to date