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

Fix reinstall logic

Browse Source
This commit is contained in:
Mike Reeves
2023-01-11 12:32:43 -05:00
parent b36f1bc79e
commit c07821a612
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
setup/so-functions
View File

@@ -1529,6 +1529,19 @@ influxdb_pillar() {
touch $influxdb_pillar_file touch $influxdb_pillar_file
} }
make_some_dirs() {
mkdir -p $local_salt_dir/pillar/minions
mkdir -p $local_salt_dir/salt/firewall/hostgroups
mkdir -p $local_salt_dir/salt/firewall/portgroups
mkdir -p $local_salt_dir/salt/firewall/ports
for THEDIR in bpf pcap elasticsearch ntp firewall redis backup influxdb strelka sensoroni curator soc soctopus docker zeek suricata nginx telegraf filebeat logstash soc manager kratos idstools idh elastalert;do
mkdir -p $local_salt_dir/pillar/$THEDIR
touch $local_salt_dir/pillar/$THEDIR/adv_$THEDIR.sls
touch $local_salt_dir/pillar/$THEDIR/soc_$THEDIR.sls
done
}
mark_version() { mark_version() {
title "Marking the current version" title "Marking the current version"
echo "$SOVERSION" > /etc/soversion echo "$SOVERSION" > /etc/soversion

2
setup/so-setup
View File

@@ -141,7 +141,6 @@ if [[ -f /root/accept_changes ]]; then
info "Old setup detected. Moving the last setup.log to setup.log.bak" info "Old setup detected. Moving the last setup.log to setup.log.bak"
mv "$setup_log" "$setup_log.bak" mv "$setup_log" "$setup_log.bak"
[ -f "$error_log" ] && mv "$error_log" "$error_log.bak" [ -f "$error_log" ] && mv "$error_log" "$error_log.bak"
source ./so-variables
reinstall_init reinstall_init
fi fi
@@ -472,6 +471,7 @@ if ! [[ -f $install_opt_file ]]; then
if [[ $waitforstate ]]; then if [[ $waitforstate ]]; then
touch /root/accept_changes touch /root/accept_changes
make_some_dirs
percentage=0 percentage=0
es_heapsize es_heapsize
ls_heapsize ls_heapsize

12
setup/so-variables
View File

@@ -79,18 +79,6 @@ export ntp_string
whiptail_title="Security Onion Setup - $SOVERSION" whiptail_title="Security Onion Setup - $SOVERSION"
export whiptail_title export whiptail_title
mkdir -p $local_salt_dir/pillar/minions
mkdir -p $local_salt_dir/salt/firewall/hostgroups
mkdir -p $local_salt_dir/salt/firewall/portgroups
mkdir -p $local_salt_dir/salt/firewall/ports
for THEDIR in bpf pcap elasticsearch ntp firewall redis backup influxdb strelka sensoroni curator soc soctopus docker zeek suricata nginx telegraf filebeat logstash soc manager kratos idstools idh elastalert
do
mkdir -p $local_salt_dir/pillar/$THEDIR
touch $local_salt_dir/pillar/$THEDIR/adv_$THEDIR.sls
touch $local_salt_dir/pillar/$THEDIR/soc_$THEDIR.sls
done
global_pillar_file="$local_salt_dir/pillar/soc_global.sls" global_pillar_file="$local_salt_dir/pillar/soc_global.sls"
export global_pillar_file export global_pillar_file