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

Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion into issue/286

Browse Source
This commit is contained in:
Mike Reeves
2020-08-26 11:01:01 -04:00
parent e1a52a4921 86584d90d7
commit 19130b563d
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
salt/common/init.sls
View File

@@ -88,7 +88,7 @@ heldpackages:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- containerd.io: 1.2.13-2 - containerd.io: 1.2.13-2
- docker-ce: 5:19.03.9~3-0~ubuntu-bionic - docker-ce: 5:19.03.12~3-0~ubuntu-bionic
- hold: True - hold: True
- update_holds: True - update_holds: True
@@ -124,7 +124,7 @@ heldpackages:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- containerd.io: 1.2.13-3.2.el7 - containerd.io: 1.2.13-3.2.el7
- docker-ce: 3:19.03.11-3.el7 - docker-ce: 3:19.03.12-3.el7
- hold: True - hold: True
- update_holds: True - update_holds: True
{% endif %} {% endif %}
@@ -186,3 +186,8 @@ sensorrotateconf:
- dayweek: '*' - dayweek: '*'
{% endif %} {% endif %}
# Make sure Docker is always running
docker:
service.running:
- enable: True

12
salt/top.sls
View File

@@ -33,8 +33,8 @@ base:
- match: compound - match: compound
- ca - ca
- ssl - ssl
- registry
- common - common
- registry
- telegraf - telegraf
- firewall - firewall
- idstools - idstools
@@ -74,9 +74,9 @@ base:
- match: compound - match: compound
- ca - ca
- ssl - ssl
- common
- registry - registry
- manager - manager
- common
- nginx - nginx
- telegraf - telegraf
- influxdb - influxdb
@@ -131,8 +131,8 @@ base:
- match: compound - match: compound
- ca - ca
- ssl - ssl
- registry
- common - common
- registry
- nginx - nginx
- telegraf - telegraf
- influxdb - influxdb
@@ -179,9 +179,9 @@ base:
- match: compound - match: compound
- ca - ca
- ssl - ssl
- common
- registry - registry
- manager - manager
- common
- nginx - nginx
- telegraf - telegraf
- influxdb - influxdb
@@ -303,8 +303,8 @@ base:
- match: compound - match: compound
- ca - ca
- ssl - ssl
- registry
- common - common
- registry
- nginx - nginx
- telegraf - telegraf
- influxdb - influxdb
@@ -395,9 +395,9 @@ base:
- match: compound - match: compound
- ca - ca
- ssl - ssl
- common
- registry - registry
- manager - manager
- common
- nginx - nginx
- soc - soc
- firewall - firewall

4
setup/so-functions
View File

@@ -752,9 +752,9 @@ docker_install() {
yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo; yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo;
fi fi
if [[ ! $is_iso ]]; then if [[ ! $is_iso ]]; then
yum -y install docker-ce-19.03.11-3.el7 containerd.io-1.2.13-3.2.el7; yum -y install docker-ce-19.03.12-3.el7 containerd.io-1.2.13-3.2.el7;
fi fi
yum versionlock docker-ce-19.03.11-3.el7; yum versionlock docker-ce-19.03.12-3.el7;
yum versionlock containerd.io-1.2.13-3.2.el7 yum versionlock containerd.io-1.2.13-3.2.el7
} >> "$setup_log" 2>&1 } >> "$setup_log" 2>&1