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

Merge pull request #986 from Security-Onion-Solutions/feature/isosetup

Browse Source 
Removes create admin user from setup
This commit is contained in:
Mike Reeves
2020-07-13 11:13:10 -04:00
committed by GitHub
parent db80675609 dc0aa270d9
commit 3bc492ebde
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
setup/so-functions
View File

@@ -656,12 +656,14 @@ detect_os() {
} }
disable_onion_user() { disable_auto_start() {
# Disable the default account cause security.
usermod -L onion
# Remove the automated setup script from crontab, if it exists # Remove the automated setup script from crontab, if it exists
crontab -u onion -r crontab -u $USER -r
# Truncate last line of the bash profile
sed -i '$ d' /home/$USER/.bash_profile
} }
disable_misc_network_features() { disable_misc_network_features() {
@@ -1418,8 +1420,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/onion/SecurityOnion/pillar/* $default_salt_dir/pillar/ >> "$setup_log" 2>&1 rsync -avh --exclude 'TRANS.TBL' /home/$USER/SecurityOnion/pillar/* $default_salt_dir/pillar/ >> "$setup_log" 2>&1
rsync -avh --exclude 'TRANS.TBL' /home/onion/SecurityOnion/salt/* $default_salt_dir/salt/ >> "$setup_log" 2>&1 rsync -avh --exclude 'TRANS.TBL' /home/$USER/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

6
setup/so-setup
View File

@@ -188,7 +188,7 @@ case "$setup_type" in
whiptail_management_interface_dns_search whiptail_management_interface_dns_search
fi fi
collect_adminuser_inputs #collect_adminuser_inputs
;; ;;
'network') 'network')
whiptail_network_notice whiptail_network_notice
@@ -341,8 +341,8 @@ if [[ "$setup_type" == 'iso' ]]; then
set_hostname_iso set_hostname_iso
set_management_interface set_management_interface
add_admin_user #add_admin_user
disable_onion_user disable_auto_start
fi fi
{ {