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

move where in the process addtotab template and data directory are created - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/749

Browse Source
This commit is contained in:
m0duspwnens
2020-05-27 13:43:55 -04:00
parent 23e9ee46b8
commit 21f1b423f3
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pillar/data/addtotab.sh
View File

@@ -15,18 +15,6 @@ MONINT=$9
#NODETYPE=$10 #NODETYPE=$10
#HOTNAME=$11 #HOTNAME=$11
if [ ! -d $local_salt_dir/pillar/data/ ]; then
mkdir -p $local_salt_dir/pillar/data/
fi
# Create the template
if [ ! -f $local_salt_dir/pillar/data/$TYPE.sls ]; then
printf '%s\n'\
"$TYPE:"\
"" > "$local_salt_dir/pillar/data"/$TYPE.sls
echo "Added $TYPE Template"
fi
echo "Seeing if this host is already in here. If so delete it" echo "Seeing if this host is already in here. If so delete it"
if grep -q $NAME "$local_salt_dir/pillar/data/$TYPE.sls"; then if grep -q $NAME "$local_salt_dir/pillar/data/$TYPE.sls"; then
echo "Node Already Present - Let's re-add it" echo "Node Already Present - Let's re-add it"

15
setup/so-functions
View File

@@ -56,6 +56,21 @@ add_master_hostfile() {
whiptail_check_exitstatus $exitstatus whiptail_check_exitstatus $exitstatus
} }
addtotab_generate_templates() {
local addtotab_path=$local_salt_dir/pillar/data
mkdir -p "$addtotab_path"
for i in evaltab mastersearchtab mastertab nodestab sensorstab
do
printf '%s\n'\
"$i:"\
"" > "$addtotab_path"/$i.sls
echo "Added $i Template"
done
}
# $5 => (optional) password variable # $5 => (optional) password variable
so_add_user() { so_add_user() {
local username=$1 local username=$1

1
setup/so-setup
View File

@@ -405,6 +405,7 @@ fi
salt_checkin >> $setup_log 2>&1 salt_checkin >> $setup_log 2>&1
if [[ $is_master || $is_helix ]]; then if [[ $is_master || $is_helix ]]; then
addtotab_generate_templates >> $setup_log 2>&1
set_progress_str 25 'Configuring firewall' set_progress_str 25 'Configuring firewall'
set_initial_firewall_policy >> $setup_log 2>&1 set_initial_firewall_policy >> $setup_log 2>&1