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

SO Setup - Fix for firewall policy add

Browse Source
This commit is contained in:
Mike Reeves
2018-08-06 12:02:54 -04:00
parent 0f97df0cad
commit dff968eb94
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
so-setup-network.sh
View File

@@ -158,7 +158,7 @@ create_bond() {
else else
# Need to add 17.04 support still # Need to add 17.04 support still
apt -y install ifenslave apt-get -y install ifenslave
echo "bonding" >> /etc/modules echo "bonding" >> /etc/modules
modprobe bonding modprobe bonding
@@ -291,7 +291,7 @@ install_master() {
if [ $OS == 'centos' ]; then if [ $OS == 'centos' ]; then
yum -y install salt-master yum -y install salt-master
else else
apt install -y salt-master apt-get install -y salt-master
fi fi
copy_master_config copy_master_config
@@ -491,7 +491,6 @@ salt_master_directories() {
# Copy over the salt code and templates # Copy over the salt code and templates
cp -R pillar/* /opt/so/saltstack/pillar/ cp -R pillar/* /opt/so/saltstack/pillar/
mkdir -p /opt/so/saltstack/pillar/firewall
chmod +x /opt/so/saltstack/pillar/firewall/addfirewall.sh chmod +x /opt/so/saltstack/pillar/firewall/addfirewall.sh
cp -R salt/* /opt/so/saltstack/salt/ cp -R salt/* /opt/so/saltstack/salt/
@@ -536,7 +535,6 @@ set_initial_firewall_policy() {
if [ $INSTALLTYPE == 'MASTERONLY' ]; then if [ $INSTALLTYPE == 'MASTERONLY' ]; then
touch $POLICYPATH/minions.sls
printf " - $MAINIP\n" >> $POLICYPATH/minions.sls printf " - $MAINIP\n" >> $POLICYPATH/minions.sls
fi fi
@@ -982,14 +980,14 @@ if (whiptail_you_sure); then
master_static master_static
echo "** Generating the master pillar **" echo "** Generating the master pillar **"
master_pillar master_pillar
echo "** Setting the initial firewall policy **"
set_initial_firewall_policy
# Do a checkin to push the key up # Do a checkin to push the key up
echo "** Pushing the key up to Master **" echo "** Pushing the key up to Master **"
salt_firstcheckin >>~/sosetup.log 2>&1 salt_firstcheckin >>~/sosetup.log 2>&1
# Accept the Master Key # Accept the Master Key
echo "** Accepting the key on the master **" echo "** Accepting the key on the master **"
accept_salt_key_local accept_salt_key_local
echo "** Setting the initial firewall policy **"
set_initial_firewall_policy
# Do the big checkin but first let them know it will take a bit. # Do the big checkin but first let them know it will take a bit.
salt_checkin_message salt_checkin_message
salt_checkin salt_checkin