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

Merge remote-tracking branch 'remotes/origin/2.4/dev' into reyesj2/kafka

Browse Source
This commit is contained in:
reyesj2
2024-06-12 12:36:58 -04:00
parent e8106befe9 092f716f12
commit 2bc53f9868
3 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
salt/docker/init.sls
View File

@@ -20,30 +20,30 @@ dockergroup:
dockerheldpackages: dockerheldpackages:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- containerd.io: 1.6.21-1 - containerd.io: 1.6.33-1
- docker-ce: 5:24.0.3-1~debian.12~bookworm - docker-ce: 5:26.1.4-1~debian.12~bookworm
- docker-ce-cli: 5:24.0.3-1~debian.12~bookworm - docker-ce-cli: 5:26.1.4-1~debian.12~bookworm
- docker-ce-rootless-extras: 5:24.0.3-1~debian.12~bookworm - docker-ce-rootless-extras: 5:26.1.4-1~debian.12~bookworm
- hold: True - hold: True
- update_holds: True - update_holds: True
{% elif grains.oscodename == 'jammy' %} {% elif grains.oscodename == 'jammy' %}
dockerheldpackages: dockerheldpackages:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- containerd.io: 1.6.21-1 - containerd.io: 1.6.33-1
- docker-ce: 5:24.0.2-1~ubuntu.22.04~jammy - docker-ce: 5:26.1.4-1~ubuntu.22.04~jammy
- docker-ce-cli: 5:24.0.2-1~ubuntu.22.04~jammy - docker-ce-cli: 5:26.1.4-1~ubuntu.22.04~jammy
- docker-ce-rootless-extras: 5:24.0.2-1~ubuntu.22.04~jammy - docker-ce-rootless-extras: 5:26.1.4-1~ubuntu.22.04~jammy
- hold: True - hold: True
- update_holds: True - update_holds: True
{% else %} {% else %}
dockerheldpackages: dockerheldpackages:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- containerd.io: 1.4.9-1 - containerd.io: 1.6.33-1
- docker-ce: 5:20.10.8~3-0~ubuntu-focal - docker-ce: 5:26.1.4-1~ubuntu.20.04~focal
- docker-ce-cli: 5:20.10.5~3-0~ubuntu-focal - docker-ce-cli: 5:26.1.4-1~ubuntu.20.04~focal
- docker-ce-rootless-extras: 5:20.10.5~3-0~ubuntu-focal - docker-ce-rootless-extras: 5:26.1.4-1~ubuntu.20.04~focal
- hold: True - hold: True
- update_holds: True - update_holds: True
{% endif %} {% endif %}
@@ -51,10 +51,10 @@ dockerheldpackages:
dockerheldpackages: dockerheldpackages:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- containerd.io: 1.6.21-3.1.el9 - containerd.io: 1.6.33-3.1.el9
- docker-ce: 24.0.4-1.el9 - docker-ce: 3:26.1.4-1.el9
- docker-ce-cli: 24.0.4-1.el9 - docker-ce-cli: 1:26.1.4-1.el9
- docker-ce-rootless-extras: 24.0.4-1.el9 - docker-ce-rootless-extras: 26.1.4-1.el9
- hold: True - hold: True
- update_holds: True - update_holds: True
{% endif %} {% endif %}

2
salt/manager/tools/sbin/soup
View File

@@ -1311,7 +1311,7 @@ EOF
# check if the FINAL_MESSAGE_QUEUE is not empty # check if the FINAL_MESSAGE_QUEUE is not empty
if (( ${#FINAL_MESSAGE_QUEUE[@]} != 0 )); then if (( ${#FINAL_MESSAGE_QUEUE[@]} != 0 )); then
echo "The following additional information applies specifically to your grid:\n" echo "The following additional information applies specifically to your grid:"
for m in "${FINAL_MESSAGE_QUEUE[@]}"; do for m in "${FINAL_MESSAGE_QUEUE[@]}"; do
echo "$m" echo "$m"
echo echo

1
salt/soc/enabled.sls
View File

@@ -27,6 +27,7 @@ so-soc:
- /opt/so/conf/strelka:/opt/sensoroni/yara:rw - /opt/so/conf/strelka:/opt/sensoroni/yara:rw
- /opt/so/conf/sigma:/opt/sensoroni/sigma:rw - /opt/so/conf/sigma:/opt/sensoroni/sigma:rw
- /opt/so/rules/elastalert/rules:/opt/sensoroni/elastalert:rw - /opt/so/rules/elastalert/rules:/opt/sensoroni/elastalert:rw
- /opt/so/rules/nids/suri:/opt/sensoroni/nids:ro
- /opt/so/conf/soc/fingerprints:/opt/sensoroni/fingerprints:rw - /opt/so/conf/soc/fingerprints:/opt/sensoroni/fingerprints:rw
- /nsm/soc/jobs:/opt/sensoroni/jobs:rw - /nsm/soc/jobs:/opt/sensoroni/jobs:rw
- /nsm/soc/uploads:/nsm/soc/uploads:rw - /nsm/soc/uploads:/nsm/soc/uploads:rw