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

Merge pull request #10923 from Security-Onion-Solutions/soupaloop

Browse Source 
Soupaloop
This commit is contained in:
Josh Patterson
2023-08-02 14:44:49 -04:00
committed by GitHub
parent 72e1cbbfb6 64776936cc
commit f3c5d26a4e
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/common/packages.sls
View File

@@ -17,6 +17,7 @@ commonpkgs:
- netcat-openbsd - netcat-openbsd
- sqlite3 - sqlite3
- libssl-dev - libssl-dev
- procps
- python3-dateutil - python3-dateutil
- python3-docker - python3-docker
- python3-packaging - python3-packaging
@@ -70,6 +71,7 @@ commonpkgs:
- net-tools - net-tools
- nmap-ncat - nmap-ncat
- openssl - openssl
- procps-ng
- python3-dnf-plugin-versionlock - python3-dnf-plugin-versionlock
- python3-docker - python3-docker
- python3-m2crypto - python3-m2crypto

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

@@ -436,7 +436,7 @@ stop_salt_master() {
echo "" echo ""
echo "Storing salt-master pid." echo "Storing salt-master pid."
MASTERPID=$(pgrep salt-master | head -1) MASTERPID=$(pgrep -f '/opt/saltstack/salt/bin/python3.10 /usr/bin/salt-master MainProcess')
echo "Found salt-master PID $MASTERPID" echo "Found salt-master PID $MASTERPID"
systemctl_func "stop" "salt-master" systemctl_func "stop" "salt-master"
timeout 30 tail --pid=$MASTERPID -f /dev/null || echo "salt-master still running at $(date +"%T.%6N") after waiting 30s. We cannot kill due to systemd restart option." timeout 30 tail --pid=$MASTERPID -f /dev/null || echo "salt-master still running at $(date +"%T.%6N") after waiting 30s. We cannot kill due to systemd restart option."
@@ -455,7 +455,7 @@ stop_salt_minion() {
set -e set -e
echo "Storing salt-minion pid." echo "Storing salt-minion pid."
MINIONPID=$(pgrep salt-minion | head -1) MINIONPID=$(pgrep -f '/opt/saltstack/salt/bin/python3.10 /usr/bin/salt-minion' | head -1)
echo "Found salt-minion PID $MINIONPID" echo "Found salt-minion PID $MINIONPID"
systemctl_func "stop" "salt-minion" systemctl_func "stop" "salt-minion"
@@ -859,7 +859,7 @@ main() {
set +e set +e
echo "Checking the number of minions." echo "Checking the number of minions."
NUM_MINIONS=$(ls /opt/so/saltstack/local/pillar/minions/*_*.sls | wc -l) NUM_MINIONS=$(ls /opt/so/saltstack/local/pillar/minions/*_*.sls | grep -v adv_ | wc -l)
if [[ $UPGRADESALT -eq 1 ]] && [[ $NUM_MINIONS -gt 1 ]]; then if [[ $UPGRADESALT -eq 1 ]] && [[ $NUM_MINIONS -gt 1 ]]; then
if [[ $is_airgap -eq 0 ]]; then if [[ $is_airgap -eq 0 ]]; then
echo "" echo ""
@@ -875,9 +875,6 @@ main() {
echo "Checking sudoers file." echo "Checking sudoers file."
check_sudoers check_sudoers
echo "Checking for necessary user migrations."
so-user migrate
systemctl_func "start" "$cron_service_name" systemctl_func "start" "$cron_service_name"
if [[ -n $lsl_msg ]]; then if [[ -n $lsl_msg ]]; then