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

Jertel Compliance

Browse Source
This commit is contained in:
Mike Reeves
2021-05-03 15:23:34 -04:00
parent 074fe46e90
commit a489b369d7
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
salt/common/tools/sbin/so-airgap-hotfixapply
View File

@@ -47,14 +47,14 @@ else
exit 1 exit 1
else else
echo "We need to apply a hotfix" echo "We need to apply a hotfix"
rsync -a $HOTFIXDIR/salt /opt/so/saltstack/default/ cd $HOTFIXDIR
rsync -a $HOTFIXDIR/pillar /opt/so/saltstack/default/ DEFAULT_SALT_DIR=/opt/so/saltstack/default
chown -R socore:socore /opt/so/saltstack/default/ copy_new_files
chmod 755 /opt/so/saltstack/default/pillar/firewall/addfirewall.sh
echo $HOTFIXVERSION > /etc/sohotfix echo $HOTFIXVERSION > /etc/sohotfix
salt-call state.highstate -l info queue=True salt-call state.highstate -l info queue=True
echo "The Hotfix $HOTFIXVERSION has been applied" echo "The Hotfix $HOTFIXVERSION has been applied"
# Clean up # Clean up
cd /tmp
rm -rf $HOTFIXDIR rm -rf $HOTFIXDIR
exit 0 exit 0
fi fi

8
salt/common/tools/sbin/so-common
View File

@@ -122,6 +122,14 @@ check_elastic_license() {
fi fi
} }
copy_new_files() {
# Copy new files over to the salt dir
rsync -a salt $DEFAULT_SALT_DIR/
rsync -a pillar $DEFAULT_SALT_DIR/
chown -R socore:socore $DEFAULT_SALT_DIR/
chmod 755 $DEFAULT_SALT_DIR/pillar/firewall/addfirewall.sh
}
disable_fastestmirror() { disable_fastestmirror() {
sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf
} }

13
salt/common/tools/sbin/soup
View File

@@ -214,16 +214,6 @@ clone_to_tmp() {
fi fi
} }
copy_new_files() {
# Copy new files over to the salt dir
cd $UPDATE_DIR
rsync -a salt $DEFAULT_SALT_DIR/
rsync -a pillar $DEFAULT_SALT_DIR/
chown -R socore:socore $DEFAULT_SALT_DIR/
chmod 755 $DEFAULT_SALT_DIR/pillar/firewall/addfirewall.sh
cd /tmp
}
generate_and_clean_tarballs() { generate_and_clean_tarballs() {
local new_version local new_version
new_version=$(cat $UPDATE_DIR/VERSION) new_version=$(cat $UPDATE_DIR/VERSION)
@@ -724,7 +714,9 @@ upgrade_check_salt
if [[ $is_hotfix ]]; then if [[ $is_hotfix ]]; then
echo "Applying $HOTFIXVERSION" echo "Applying $HOTFIXVERSION"
cd $UPDATE_DIR
copy_new_files copy_new_files
cd /tmp
echo "" echo ""
update_version update_version
salt-call state.highstate -l info queue=True salt-call state.highstate -l info queue=True
@@ -795,6 +787,7 @@ else
echo "" echo ""
echo "Copying new Security Onion code from $UPDATE_DIR to $DEFAULT_SALT_DIR." echo "Copying new Security Onion code from $UPDATE_DIR to $DEFAULT_SALT_DIR."
copy_new_files copy_new_files
cd /tmp
echo "" echo ""
update_version update_version