mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-06 17:22:49 +01:00
fix merge conflict
This commit is contained in:
@@ -2035,17 +2035,13 @@ saltify() {
|
||||
fi
|
||||
|
||||
if [[ $is_rocky ]]; then
|
||||
# THIS IS A TEMP HACK
|
||||
#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"
|
||||
logCmd "dnf -y install salt salt-master salt-minion"
|
||||
|
||||
#if [[ $waitforstate ]]; then
|
||||
# # Since this is a salt master so let's install it
|
||||
# logCmd ""
|
||||
#else
|
||||
# # We just need the minion
|
||||
# logCmd "dnf -y install salt-minion"
|
||||
#fi
|
||||
if [[ $waitforstate ]]; then
|
||||
# install all for a manager
|
||||
logCmd "dnf -y install salt salt-master salt-minion"
|
||||
else
|
||||
# We just need the minion
|
||||
logCmd "dnf -y install salt salt-minion"
|
||||
fi
|
||||
fi
|
||||
|
||||
logCmd "mkdir -p /etc/salt/minion.d"
|
||||
|
||||
Reference in New Issue
Block a user