Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion into dev

salt/manager/init.sls

@@ -88,7 +88,14 @@ append_so-aptcacherng_so-status.conf:
 
 {% endif %}
 
-strelka_yara_update_old:
+strelka_yara_update_old_1:
+  cron.absent:
+    - user: root
+    - name: '[ -d /opt/so/saltstack/default/salt/strelka/rules/ ] && /usr/sbin/so-yara-update > /dev/null 2>&1'
+    - hour: '7'
+    - minute: '1'
+
+strelka_yara_update_old_2:
   cron.absent:
     - user: root
     - name: '/usr/sbin/so-yara-update > /dev/null 2>&1'

salt/suricata/defaults.yaml

@@ -460,8 +460,6 @@ suricata:
         enabled: true
         ports: $VXLAN_PORTS
       erspan:
-        typeI:
-          enabled: false
     detect:
       profile: medium
       custom-values:

salt/yum/etc/yum.conf.jinja

@@ -10,6 +10,7 @@ plugins=1
 installonly_limit={{ salt['pillar.get']('yum:config:installonly_limit', 2) }}
 bugtracker_url=http://bugs.centos.org/set_project.php?project_id=23&ref=http://bugs.centos.org/bug_report_page.php?category=yum
 distroverpkg=centos-release
+clean_requirements_on_remove=1
 
 {% if (grains['role'] not in ['so-eval','so-managersearch', 'so-manager', 'so-standalone']) and salt['pillar.get']('global:managerupdate', '0') %}
 proxy=http://{{ salt['pillar.get']('yum:config:proxy', salt['config.get']('master')) }}:3142

setup/so-setup

@@ -175,7 +175,7 @@ if ! [[ -f $install_opt_file ]]; then
 		echo "User cancelled setup." | tee -a "$setup_log"
 		whiptail_cancel
 	fi
-	if [[ $setup_type == 'iso' ]]; then
+	if [[ $setup_type == 'iso' ]] && [ "$automated" == no ]; then
 		whiptail_first_menu_iso
 		if [[ $option == "Configure Network" ]]; then
 			network_init_whiptail
@@ -184,9 +184,7 @@ if ! [[ -f $install_opt_file ]]; then
 			printf '%s\n' \
 				"MNIC=$MNIC" \
 				"HOSTNAME=$HOSTNAME" > "$net_init_file"
-			whiptail --title "Security Onion Setup" \
-				--msgbox "Successfully set up networking, setup will now exit." 7 75
-			exit 0
+			whiptail_net_setup_complete
 		else
 			whiptail_install_type
 		fi

setup/so-whiptail

@@ -662,8 +662,8 @@ whiptail_first_menu_iso() {
 	[ -n "$TESTING" ] && return
 
 	option=$(whiptail --title "Security Onion Setup" --menu "Select an option" 10 75 2 \
-		"Configure Network" "Configure networking only " \
 		"Security Onion Installer" "Run the standard Security Onion installation " \
+		"Configure Network" "Configure networking only " \
 		 3>&1 1>&2 2>&3
 	)
 	local exitstatus=$?
@@ -794,6 +794,13 @@ whiptail_management_interface_setup() {
 	whiptail_check_exitstatus $exitstatus
 }
 
+whiptail_net_setup_complete() {
+	[ -n "$TESTING" ] && return
+
+	whiptail --title "Security Onion Setup" \
+		--msgbox "Successfully set up networking, setup will now exit." 7 75
+	exit 0
+}
 
 
 whiptail_management_server() {