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

fix merge conflict

Browse Source
This commit is contained in:
m0duspwnens
2023-04-10 09:09:43 -04:00
parent 16249cc80d b87ee4904f
commit 9ea3eaafae
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
setup/so-functions
View File

@@ -2035,17 +2035,13 @@ saltify() {
fi fi
if [[ $is_rocky ]]; then if [[ $is_rocky ]]; then
# THIS IS A TEMP HACK if [[ $waitforstate ]]; then
#logCmd "dnf -y install securityonion-salt python3-audit python3-libsemanage python3-policycoreutils python3-setools python3-setuptools python3-chardet python3-idna python3-pysocks python3-requests python3-urllib3 python3-websocket-client python3-docker" # install all for a manager
logCmd "dnf -y install salt salt-master salt-minion" logCmd "dnf -y install salt salt-master salt-minion"
else
#if [[ $waitforstate ]]; then # We just need the minion
# # Since this is a salt master so let's install it logCmd "dnf -y install salt salt-minion"
# logCmd "" fi
#else
# # We just need the minion
# logCmd "dnf -y install salt-minion"
#fi
fi fi
logCmd "mkdir -p /etc/salt/minion.d" logCmd "mkdir -p /etc/salt/minion.d"