Merge branch 'master' of https://github.com/TOoSmOotH/securityonion-saltstack

setup/functions.sh

@@ -1166,6 +1166,15 @@ set_hostname() {
 
 }
 
+set_hostname_iso() {
+
+  hostnamectl set-hostname --static $HOSTNAME
+  echo "127.0.0.1   $HOSTNAME $HOSTNAME.localdomain localhost localhost.localdomain localhost4 localhost4.localdomain" > /etc/hosts
+  echo "::1   localhost localhost.localdomain localhost6 localhost6.localdomain6" >> /etc/hosts
+  echo $HOSTNAME > /etc/hostname
+
+}
+
 set_initial_firewall_policy() {
 
   get_main_ip

setup/so-setup.sh

@@ -71,13 +71,13 @@ if (whiptail_you_sure) ; then
     # Set management nic
     whiptail_management_nic
 
-    whiptail_create_socore_user
-    SCMATCH=no
-    while [ $SCMATCH != yes ]; do
-      whiptail_create_socore_user_password1
-      whiptail_create_socore_user_password2
-      check_socore_pass
-    done
+#    whiptail_create_socore_user
+#    SCMATCH=no
+#    while [ $SCMATCH != yes ]; do
+#      whiptail_create_socore_user_password1
+#      whiptail_create_socore_user_password2
+#      check_socore_pass
+#    done
 
   else
 
@@ -98,7 +98,7 @@ if (whiptail_you_sure) ; then
     fi
 
     # Go ahead and bring up networking so other parts of the install work
-    set_hostname
+    set_hostname_iso
     set_management_interface
 
     # Add an admin user
@@ -166,7 +166,10 @@ if (whiptail_you_sure) ; then
     get_filesystem_root
     get_filesystem_nsm
     get_main_ip
-    add_socore_user_master
+    if [ $INSTALLMETHOD == iso ]; then
+      disable_onion_user
+    fi
+    #add_socore_user_master
     # Install salt and dependencies
     {
       sleep 0.5
@@ -285,6 +288,15 @@ if (whiptail_you_sure) ; then
       fi
     fi
 
+    # Get a password for the socore user
+    whiptail_create_socore_user
+    SCMATCH=no
+    while [ $SCMATCH != yes ]; do
+      whiptail_create_socore_user_password1
+      whiptail_create_socore_user_password2
+      check_socore_pass
+    done
+
     # Last Chance to back out
     whiptail_make_changes
     set_hostname
@@ -300,6 +312,9 @@ if (whiptail_you_sure) ; then
 
     # Figure out the main IP address
     get_main_ip
+    if [ $INSTALLMETHOD == iso ]; then
+      disable_onion_user
+    fi
 
     # Add the user so we can sit back and relax
     #echo ""
@@ -441,6 +456,9 @@ if (whiptail_you_sure) ; then
     mkdir -p /nsm
     get_filesystem_root
     get_filesystem_nsm
+    if [ $INSTALLMETHOD == iso ]; then
+      disable_onion_user
+    fi
     copy_ssh_key >> $SETUPLOG 2>&1
     {
       sleep 0.5
@@ -535,6 +553,9 @@ if (whiptail_you_sure) ; then
     get_filesystem_nsm
     get_log_size_limit
     get_main_ip
+    if [ $INSTALLMETHOD == iso ]; then
+      disable_onion_user
+    fi
     # Add the user so we can sit back and relax
     add_socore_user_master
     {
@@ -688,6 +709,9 @@ if (whiptail_you_sure) ; then
     mkdir -p /nsm
     get_filesystem_root
     get_filesystem_nsm
+    if [ $INSTALLMETHOD == iso ]; then
+      disable_onion_user
+    fi
     copy_ssh_key >> $SETUPLOG 2>&1
     {
       sleep 0.5

setup/whiptail.sh

@@ -106,6 +106,32 @@ whiptail_check_exitstatus() {
 
 }
 
+whiptail_create_admin_user() {
+
+  ADMINUSER=$(whiptail --title "Security Onion Install" --inputbox \
+  "Please enter a username for your new admin user" 10 60 3>&1 1>&2 2>&3)
+
+}
+
+whiptail_create_admin_user_password1() {
+
+  ADMINPASS1=$(whiptail --title "Security Onion Install" --passwordbox \
+  "Enter a password for $ADMINUSER" 10 60 3>&1 1>&2 2>&3)
+
+  local exitstatus=$?
+  whiptail_check_exitstatus $exitstatus
+}
+
+whiptail_create_admin_user_password2() {
+
+  ADMINPASS2=$(whiptail --title "Security Onion Install" --passwordbox \
+  "Re-enter a password for $ADMINUSER" 10 60 3>&1 1>&2 2>&3)
+
+  local exitstatus=$?
+  whiptail_check_exitstatus $exitstatus
+
+}
+
 whiptail_create_socore_user() {
 
   whiptail --title "Security Onion Setup" --msgbox "Set a password for the socore user. This account is used for adding sensors remotely." 8 75
@@ -141,6 +167,18 @@ whiptail_cur_close_days() {
   whiptail_check_exitstatus $exitstatus
 
 }
+
+whiptail_dhcp_or_static() {
+
+  ADDRESSTYPE=$(whiptail --title "Security Onion Setup" --radiolist \
+  "Choose how to set up your management interface:" 20 78 4 \
+  "STATIC" "Set a static IPv4 address" ON  \
+  "DHCP" "Use DHCP to configure the Management Interface" OFF 3>&1 1>&2 2>&3 )
+
+  local exitstatus=$?
+  whiptail_check_exitstatus $exitstatus
+}
+
 whiptail_enable_components() {
   COMPONENTS=$(whiptail --title "Security Onion Setup" --checklist \
   "Select Components to install" 20 75 8 \
@@ -239,6 +277,40 @@ whiptail_log_size_limit() {
 
 }
 
+whiptail_management_interface_dns() {
+
+  MDNS=$(whiptail --title "Security Onion Setup" --inputbox \
+  "Enter your DNS server using space between multiple" 10 60 8.8.8.8 8.8.4.4 3>&1 1>&2 2>&3)
+
+}
+
+whiptail_management_interface_dns_search() {
+
+  MSEARCH=$(whiptail --title "Security Onion Setup" --inputbox \
+  "Enter your DNS search domain" 10 60 searchdomain.local 3>&1 1>&2 2>&3)
+
+}
+
+whiptail_management_interface_gateway() {
+
+  MGATEWAY=$(whiptail --title "Security Onion Setup" --inputbox \
+  "Enter your gateway" 10 60 X.X.X.X 3>&1 1>&2 2>&3)
+
+}
+
+whiptail_management_interface_ip() {
+
+  MIP=$(whiptail --title "Security Onion Setup" --inputbox \
+  "Enter your IP address" 10 60 X.X.X.X 3>&1 1>&2 2>&3)
+
+}
+
+whiptail_management_interface_mask() {
+
+  MMASK=$(whiptail --title "Security Onion Setup" --inputbox \
+  "Enter the bit mask for your subnet" 10 60 24 3>&1 1>&2 2>&3)
+
+}
 
 whiptail_management_nic() {