Merge pull request #11231 from Security-Onion-Solutions/issue/10975

Issue/10975

pillar/top.sls

@@ -2,21 +2,23 @@ base:
   '*':
     - global.soc_global
     - global.adv_global
-    - docker.soc_docker
-    - docker.adv_docker
-    - firewall.soc_firewall
-    - firewall.adv_firewall
-    - influxdb.token
     - logrotate.soc_logrotate
     - logrotate.adv_logrotate
-    - nginx.soc_nginx
-    - nginx.adv_nginx
-    - node_data.ips
     - ntp.soc_ntp
     - ntp.adv_ntp
     - patch.needs_restarting
     - patch.soc_patch
     - patch.adv_patch
+
+  '* and not *_desktop':
+    - docker.soc_docker
+    - docker.adv_docker
+    - firewall.soc_firewall
+    - firewall.adv_firewall
+    - influxdb.token
+    - nginx.soc_nginx
+    - nginx.adv_nginx
+    - node_data.ips
     - sensoroni.soc_sensoroni
     - sensoroni.adv_sensoroni
     - telegraf.soc_telegraf

salt/desktop/scripts/convert-gnome-classic.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-echo "Setting default session to gnome-classic"
-cp /usr/share/accountsservice/user-templates/standard /etc/accountsservice/user-templates/
-sed -i 's|Session=gnome|Session=gnome-classic|g' /etc/accountsservice/user-templates/standard

salt/desktop/xwindows.sls

@@ -12,10 +12,7 @@ graphical_target:
     - require:
       - desktop_packages
 
-convert_gnome_classic:
-  cmd.script:
-    - name: salt://desktop/scripts/convert-gnome-classic.sh
-
+{# set users to use gnome-classic #}
 {%   for username in salt['file.find'](path='/home/',mindepth=1,maxdepth=1,type='d') %}
 {%     set username = username.split('/')[2] %}
 {%     if username != 'zeek' %}

setup/so-setup

@@ -578,9 +578,9 @@ if ! [[ -f $install_opt_file ]]; then
 		set_minion_info
 		whiptail_end_settings
 
+	# desktop install will only get this far if joining the grid
 	elif [[ $is_desktop ]]; then
 		info "Setting up as node type desktop"
-		#check_requirements "desktop"
 		networking_needful
 		collect_mngr_hostname
 		add_mngr_ip_to_hosts