From d4fbf7d6a694288aa6bb9168dd2245eee7011d17 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 3 Aug 2023 15:26:43 -0400
Subject: [PATCH 1/5] convert to gnome classic

---
 salt/desktop/scripts/convert-gnome-classic.sh | 0
 salt/desktop/xwindows.sls                     | 4 ++++
 2 files changed, 4 insertions(+)
 create mode 100644 salt/desktop/scripts/convert-gnome-classic.sh

diff --git a/salt/desktop/scripts/convert-gnome-classic.sh b/salt/desktop/scripts/convert-gnome-classic.sh
new file mode 100644
index 000000000..e69de29bb
diff --git a/salt/desktop/xwindows.sls b/salt/desktop/xwindows.sls
index ea0c7df4f..ebb7ecb9f 100644
--- a/salt/desktop/xwindows.sls
+++ b/salt/desktop/xwindows.sls
@@ -14,6 +14,10 @@ graphical_target:
     - require:
       - desktop_packages
 
+convert_gnome_classic:
+  cmd.script:
+    - name: salt://desktop/scripts/convert-gnome-classic.sh
+
 {% else %}
 
 desktop_xwindows_os_fail:

From 15b8e1a753902b906e9a73f274bd8fb46760e120 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 3 Aug 2023 15:37:26 -0400
Subject: [PATCH 2/5] add convert-gnome-classic.sh

---
 salt/desktop/scripts/convert-gnome-classic.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/salt/desktop/scripts/convert-gnome-classic.sh b/salt/desktop/scripts/convert-gnome-classic.sh
index e69de29bb..e69a43b2d 100644
--- a/salt/desktop/scripts/convert-gnome-classic.sh
+++ b/salt/desktop/scripts/convert-gnome-classic.sh
@@ -0,0 +1,4 @@
+#!/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

From 36747cf940566bb6aaccf50a7e5b3dad094f4197 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 4 Aug 2023 13:52:01 -0400
Subject: [PATCH 3/5] add networkminer to desktop.packages

---
 salt/desktop/packages.sls | 1 +
 1 file changed, 1 insertion(+)

diff --git a/salt/desktop/packages.sls b/salt/desktop/packages.sls
index 3b0d4c8ba..5c0121e7b 100644
--- a/salt/desktop/packages.sls
+++ b/salt/desktop/packages.sls
@@ -349,6 +349,7 @@ desktop_packages:
       - snappy
       - sound-theme-freedesktop
       - soundtouch
+      - securityonion-networkminer
       - speech-dispatcher
       - speech-dispatcher-espeak-ng
       - speex

From 0ba1e7521a551fa5f3d5b85dba7651e54325619b Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 4 Aug 2023 15:36:44 -0400
Subject: [PATCH 4/5] set default session for preexisting users

---
 salt/desktop/files/session.jinja |  7 +++++++
 salt/desktop/xwindows.sls        | 17 +++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 salt/desktop/files/session.jinja

diff --git a/salt/desktop/files/session.jinja b/salt/desktop/files/session.jinja
new file mode 100644
index 000000000..823e62f2d
--- /dev/null
+++ b/salt/desktop/files/session.jinja
@@ -0,0 +1,7 @@
+# This file is managed by Salt in the desktop.xwindows state
+# It will not be overwritten if it already exists
+
+[User]
+Session=gnome-classic
+Icon=/home/{{USERNAME}}/.face
+SystemAccount=false
diff --git a/salt/desktop/xwindows.sls b/salt/desktop/xwindows.sls
index ebb7ecb9f..792724eb4 100644
--- a/salt/desktop/xwindows.sls
+++ b/salt/desktop/xwindows.sls
@@ -18,6 +18,23 @@ convert_gnome_classic:
   cmd.script:
     - name: salt://desktop/scripts/convert-gnome-classic.sh
 
+{% for username in salt['file.find'](path='/home/',mindepth=1,maxdepth=1,type='d') %}
+{%   set username = username.split('/')[2] %}
+{%   if username != 'zeek' %}
+{%     if not salt['file.file_exists']('/var/lib/AccountsService/users/' ~ username) %}
+
+{{username}}_session:
+  file.managed:
+    - name: /var/lib/AccountsService/users/{{username}}
+    - source: salt://desktop/files/session.jinja
+    - template: jinja
+    - defaults:
+        USERNAME: {{username}}
+
+{%     endif %}
+{%   endif %}
+{% endfor %}
+
 {% else %}
 
 desktop_xwindows_os_fail:

From 89c4f58296aa3ed2081b9a73c56bf88adf75b030 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 4 Aug 2023 15:41:10 -0400
Subject: [PATCH 5/5] fix indents

---
 salt/desktop/xwindows.sls | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/salt/desktop/xwindows.sls b/salt/desktop/xwindows.sls
index 792724eb4..c7790f9f4 100644
--- a/salt/desktop/xwindows.sls
+++ b/salt/desktop/xwindows.sls
@@ -18,10 +18,10 @@ convert_gnome_classic:
   cmd.script:
     - name: salt://desktop/scripts/convert-gnome-classic.sh
 
-{% for username in salt['file.find'](path='/home/',mindepth=1,maxdepth=1,type='d') %}
-{%   set username = username.split('/')[2] %}
-{%   if username != 'zeek' %}
-{%     if not salt['file.file_exists']('/var/lib/AccountsService/users/' ~ username) %}
+{%   for username in salt['file.find'](path='/home/',mindepth=1,maxdepth=1,type='d') %}
+{%     set username = username.split('/')[2] %}
+{%     if username != 'zeek' %}
+{%       if not salt['file.file_exists']('/var/lib/AccountsService/users/' ~ username) %}
 
 {{username}}_session:
   file.managed:
@@ -31,9 +31,9 @@ convert_gnome_classic:
     - defaults:
         USERNAME: {{username}}
 
+{%       endif %}
 {%     endif %}
-{%   endif %}
-{% endfor %}
+{%   endfor %}
 
 {% else %}