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

Merge branch 'dev' into feature/setup

Browse Source 
# Conflicts:
#	setup/so-setup
This commit is contained in:
William Wernert
2020-07-13 14:35:24 -04:00
parent c585713122 00f178197c
commit 1cf0732991
3 changed files with 47 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
setup/so-functions
View File

@@ -659,10 +659,10 @@ detect_os() {
disable_auto_start() { disable_auto_start() {
# Remove the automated setup script from crontab, if it exists # Remove the automated setup script from crontab, if it exists
crontab -u $USER -r crontab -u $INSTALLUSERNAME -r
# Truncate last line of the bash profile # Truncate last line of the bash profile
sed -i '$ d' /home/$USER/.bash_profile sed -i '$ d' /home/$INSTALLUSERNAME/.bash_profile
} }
@@ -1156,6 +1156,11 @@ elasticsearch_pillar() {
cat "$pillar_file" >> "$setup_log" 2>&1 cat "$pillar_file" >> "$setup_log" 2>&1
} }
parse_install_username() {
# parse out the install username so things copy correctly
INSTALLUSERNAME=$(pwd | sed -E 's/\// /g' | awk '{ print $2 }')
}
patch_pillar() { patch_pillar() {
local pillar_file=$temp_install_dir/pillar/minions/$MINION_ID.sls local pillar_file=$temp_install_dir/pillar/minions/$MINION_ID.sls
@@ -1420,8 +1425,8 @@ setup_salt_master_dirs() {
# Copy over the salt code and templates # Copy over the salt code and templates
if [ "$setup_type" = 'iso' ]; then if [ "$setup_type" = 'iso' ]; then
rsync -avh --exclude 'TRANS.TBL' /home/$USER/SecurityOnion/pillar/* $default_salt_dir/pillar/ >> "$setup_log" 2>&1 rsync -avh --exclude 'TRANS.TBL' /home/$INSTALLUSERNAME/SecurityOnion/pillar/* $default_salt_dir/pillar/ >> "$setup_log" 2>&1
rsync -avh --exclude 'TRANS.TBL' /home/$USER/SecurityOnion/salt/* $default_salt_dir/salt/ >> "$setup_log" 2>&1 rsync -avh --exclude 'TRANS.TBL' /home/$INSTALLUSERNAME/SecurityOnion/salt/* $default_salt_dir/salt/ >> "$setup_log" 2>&1
else else
cp -R ../pillar/* $default_salt_dir/pillar/ >> "$setup_log" 2>&1 cp -R ../pillar/* $default_salt_dir/pillar/ >> "$setup_log" 2>&1
cp -R ../salt/* $default_salt_dir/salt/ >> "$setup_log" 2>&1 cp -R ../salt/* $default_salt_dir/salt/ >> "$setup_log" 2>&1

7
setup/so-setup
View File

@@ -47,6 +47,9 @@ while [[ $# -gt 0 ]]; do
done done
# Begin Installation pre-processing # Begin Installation pre-processing
parse_install_username
echo "Installing as the $INSTALLUSERNAME user." >> $setup_log 2>&1
echo "---- Starting setup at $(date -u) ----" >> $setup_log 2>&1 echo "---- Starting setup at $(date -u) ----" >> $setup_log 2>&1
automated=no automated=no
@@ -619,11 +622,13 @@ fi
success=$(tail -10 $setup_log | grep Failed | awk '{ print $2}') success=$(tail -10 $setup_log | grep Failed | awk '{ print $2}')
if [[ $success != 0 ]]; then SO_ERROR=1; fi # evaluate success first so it doesn't check against the output of so-allow
if [[ -n $ALLOW_ROLE && -n $ALLOW_CIDR ]]; then if [[ -n $ALLOW_ROLE && -n $ALLOW_CIDR ]]; then
IP=$ALLOW_CIDR so-allow -$ALLOW_ROLE >> $setup_log 2>&1 IP=$ALLOW_CIDR so-allow -$ALLOW_ROLE >> $setup_log 2>&1
fi fi
if [[ $success != 0 || -n $SO_ERROR ]]; then if [[ -n $SO_ERROR ]]; then
SKIP_REBOOT=1 SKIP_REBOOT=1
whiptail_setup_failed whiptail_setup_failed
else else

15
setup/so-whiptail
View File

@@ -896,10 +896,10 @@ whiptail_patch_schedule_select_hours() {
# Select the hours to patch # Select the hours to patch
PATCHSCHEDULEHOURS=$(whiptail --title "Security Onion Setup" --checklist \ PATCHSCHEDULEHOURS=$(whiptail --title "Security Onion Setup" --checklist \
"At which time, UTC, do you want to apply OS patches on the selected days? Hours 12 through 23 can be selected on the next screen." 22 75 13 \ "At which time, UTC, do you want to apply OS patches on the selected days?" 22 75 13 \
00:00 "" OFF \ 00:00 "" OFF \
01:00 "" OFF \ 01:00 "" OFF \
02:00 "" OFF \ 02:00 "" ON \
03:00 "" OFF \ 03:00 "" OFF \
04:00 "" OFF \ 04:00 "" OFF \
05:00 "" OFF \ 05:00 "" OFF \
@@ -908,18 +908,11 @@ whiptail_patch_schedule_select_hours() {
08:00 "" OFF \ 08:00 "" OFF \
09:00 "" OFF \ 09:00 "" OFF \
10:00 "" OFF \ 10:00 "" OFF \
11:00 "" OFF 3>&1 1>&2 2>&3 ) 11:00 "" OFF \
local exitstatus=$?
whiptail_check_exitstatus $exitstatus
# Select the hours to patch
PATCHSCHEDULEHOURS+=$(whiptail --title "Security Onion Setup" --checklist \
"At which time, UTC, do you want to apply OS patches on the selected days?" 22 75 13 \
12:00 "" OFF \ 12:00 "" OFF \
13:00 "" OFF \ 13:00 "" OFF \
14:00 "" OFF \ 14:00 "" OFF \
15:00 "" ON \ 15:00 "" OFF \
16:00 "" OFF \ 16:00 "" OFF \
17:00 "" OFF \ 17:00 "" OFF \
18:00 "" OFF \ 18:00 "" OFF \