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

Salt 3006 temp

Browse Source
This commit is contained in:
Mike Reeves
2023-02-16 17:49:07 -05:00
parent 01edb5dc00
commit 405060674c
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
setup/so-functions
View File

@@ -617,7 +617,8 @@ configure_minion() {
sed -i "s/{{ GLOBALS.main_interface }}/$MNIC/" /etc/salt/minion.d/mine_functions.conf sed -i "s/{{ GLOBALS.main_interface }}/$MNIC/" /etc/salt/minion.d/mine_functions.conf
{ {
systemctl restart salt-minion; logCmd "systemctl enable salt-minion";
logCmd "systemctl restart salt-minion";
} >> "$setup_log" 2>&1 } >> "$setup_log" 2>&1
} }
@@ -817,10 +818,10 @@ copy_salt_master_config() {
title "Copy the Salt master config template to the proper directory" title "Copy the Salt master config template to the proper directory"
if [ "$setup_type" = 'iso' ]; then if [ "$setup_type" = 'iso' ]; then
logCmd "cp /root/SecurityOnion/files/salt/master/master /etc/salt/master" logCmd "cp /root/SecurityOnion/files/salt/master/master /etc/salt/master"
logCmd "cp /root/SecurityOnion/files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service" #logCmd "cp /root/SecurityOnion/files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service"
else else
logCmd "cp ../files/salt/master/master /etc/salt/master" logCmd "cp ../files/salt/master/master /etc/salt/master"
logCmd "cp ../files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service" #logCmd "cp ../files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service"
fi fi
info "Copying pillar and salt files in $temp_install_dir to $local_salt_dir" info "Copying pillar and salt files in $temp_install_dir to $local_salt_dir"
logCmd "cp -Rv $temp_install_dir/pillar/ $local_salt_dir/" logCmd "cp -Rv $temp_install_dir/pillar/ $local_salt_dir/"
@@ -830,6 +831,7 @@ copy_salt_master_config() {
# Restart the service so it picks up the changes # Restart the service so it picks up the changes
logCmd "systemctl daemon-reload" logCmd "systemctl daemon-reload"
logCmd "systemctl enable salt-master"
logCmd "systemctl restart salt-master" logCmd "systemctl restart salt-master"
} }
@@ -2008,16 +2010,17 @@ saltify() {
fi fi
if [[ $is_centos ]]; then if [[ $is_rocky ]]; then
RUSALTY=$(rpm -qa | grep salt-minion | wc -l) RUSALTY=$(rpm -qa | grep salt-minion | wc -l)
if [[ "$RUSALTY" -gt 0 ]]; then if [[ "$RUSALTY" -gt 0 ]]; then
# Salt is already installed. # Salt is already installed.
info "salt is installed" info "salt is installed"
else else
# Install salt # THIS IS A TEMP HACK
logCmd "dnf -y install securityonion-salt"
if [[ $waitforstate ]]; then if [[ $waitforstate ]]; then
# Since this is a salt master so let's install it # Since this is a salt master so let's install it
logCmd "dnf -y install salt-minion salt-master" logCmd ""
else else
# We just need the minion # We just need the minion
logCmd "dnf -y install salt-minion" logCmd "dnf -y install salt-minion"