From c13c37f40684922a26cb3ee55ccb9e2f4ffc5fe5 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Wed, 21 Jun 2023 13:49:01 -0400
Subject: [PATCH] Fix desktop state

---
 salt/desktop/init.sls       | 4 ++--
 salt/desktop/packages.sls   | 2 +-
 salt/desktop/remove_gui.sls | 4 ++--
 salt/desktop/trusted-ca.sls | 2 +-
 salt/desktop/xwindows.sls   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/salt/desktop/init.sls b/salt/desktop/init.sls
index e270c0430..217a4777d 100644
--- a/salt/desktop/init.sls
+++ b/salt/desktop/init.sls
@@ -1,7 +1,7 @@
 include:
-  - workstation.xwindows
+  - desktop.xwindows
 {# If the master is 'salt' then the minion hasn't been configured and isn't connected to the grid. #}
 {# We need this since the trusted-ca state uses mine data. #}
 {% if grains.master != 'salt' %}
-  - workstation.trusted-ca
+  - desktop.trusted-ca
 {% endif %}
diff --git a/salt/desktop/packages.sls b/salt/desktop/packages.sls
index 255dd684a..9c3e8ccd2 100644
--- a/salt/desktop/packages.sls
+++ b/salt/desktop/packages.sls
@@ -295,7 +295,7 @@ desktop_packages:
 
 {% else %}
 
-workstation_packages_os_fail:
+desktop_packages_os_fail:
   test.fail_without_changes:
     - comment: 'SO Analyst Workstation can only be installed on Rocky'
 
diff --git a/salt/desktop/remove_gui.sls b/salt/desktop/remove_gui.sls
index 363b8c433..e66700f11 100644
--- a/salt/desktop/remove_gui.sls
+++ b/salt/desktop/remove_gui.sls
@@ -10,8 +10,8 @@ remove_graphical_target:
     - force: True
 
 {% else %}
-workstation_trusted-ca_os_fail:
+desktop_trusted-ca_os_fail:
   test.fail_without_changes:
-    - comment: 'SO Analyst Workstation can only be installed on CentOS'
+    - comment: 'SO Desktop can only be installed on Rocky'
 
 {% endif %}
diff --git a/salt/desktop/trusted-ca.sls b/salt/desktop/trusted-ca.sls
index a8d48c046..0045f9cd2 100644
--- a/salt/desktop/trusted-ca.sls
+++ b/salt/desktop/trusted-ca.sls
@@ -29,7 +29,7 @@ update_ca_certs:
 
 {% else %}
 
-workstation_trusted-ca_os_fail:
+desktop_trusted-ca_os_fail:
   test.fail_without_changes:
     - comment: 'SO Analyst Workstation can only be installed on CentOS'
 
diff --git a/salt/desktop/xwindows.sls b/salt/desktop/xwindows.sls
index 15e0a0a45..a15996112 100644
--- a/salt/desktop/xwindows.sls
+++ b/salt/desktop/xwindows.sls
@@ -16,7 +16,7 @@ graphical_target:
 
 {% else %}
 
-workstation_xwindows_os_fail:
+desktop_xwindows_os_fail:
   test.fail_without_changes:
     - comment: 'SO Analyst Workstation can only be installed on Rocky'