rename workstation to desktop for firewall

salt/firewall/defaults.yaml

@@ -26,7 +26,7 @@ firewall:
     standalone: []
     strelka_frontend: []
     syslog: []
-    workstation: []
+    desktop: []
     customhostgroup0: []
     customhostgroup1: []
     customhostgroup2: []
@@ -462,7 +462,7 @@ firewall:
             endgame:
               portgroups:
                 - endgame
-            workstation:
+            desktop:
               portgroups:
                 - yum
             customhostgroup0:
@@ -514,7 +514,7 @@ firewall:
             receiver:
               portgroups:
                 - salt_manager
-            workstation:
+            desktop:
               portgroups:
                 - salt_manager
             self:
@@ -650,7 +650,7 @@ firewall:
             endgame:
               portgroups:
                 - endgame
-            workstation:
+            desktop:
               portgroups:
                 - yum
             customhostgroup0:
@@ -702,7 +702,7 @@ firewall:
             receiver:
               portgroups:
                 - salt_manager
-            workstation:
+            desktop:
               portgroups:
                 - salt_manager
             self:
@@ -846,7 +846,7 @@ firewall:
             strelka_frontend:
               portgroups:
                 - strelka_frontend
-            workstation:
+            desktop:
               portgroups:
                 - yum
             customhostgroup0:
@@ -901,7 +901,7 @@ firewall:
             receiver:
               portgroups:
                 - salt_manager
-            workstation:
+            desktop:
               portgroups:
                 - salt_manager
             self:
@@ -1200,7 +1200,7 @@ firewall:
             analyst:
               portgroups:
                 - nginx
-            workstation:
+            desktop:
               portgroups:
                 - yum
             customhostgroup0:

salt/firewall/soc_firewall.yaml

@@ -45,7 +45,7 @@ firewall:
     standalone: *hostgroupsettings
     strelka_frontend: *hostgroupsettings
     syslog: *hostgroupsettings
-    workstation: *hostgroupsettings
+    desktop: *hostgroupsettings
     customhostgroup0: &customhostgroupsettings
       description: List of IP or CIDR blocks to allow to this hostgroup.
       forcedType: "[]string"
@@ -216,7 +216,7 @@ firewall:
               portgroups: *portgroupsdocker
             analyst:
               portgroups: *portgroupsdocker
-            workstation:
+            desktop:
               portgroups: *portgroupsdocker
             customhostgroup0:
               portgroups: *portgroupsdocker
@@ -366,7 +366,7 @@ firewall:
               portgroups: *portgroupsdocker
             analyst:
               portgroups: *portgroupsdocker
-            workstation:
+            desktop:
               portgroups: *portgroupsdocker
             customhostgroup0:
               portgroups: *portgroupsdocker
@@ -404,7 +404,7 @@ firewall:
               portgroups: *portgroupshost
             heavynode:
               portgroups: *portgroupshost
-            workstation:
+            desktop:
               portgroups: *portgroupshost
             customhostgroup0:
               portgroups: *portgroupshost
@@ -457,7 +457,7 @@ firewall:
               portgroups: *portgroupsdocker
             analyst:
               portgroups: *portgroupsdocker
-            workstation:
+            desktop:
               portgroups: *portgroupsdocker
             customhostgroup0:
               portgroups: *portgroupsdocker
@@ -495,7 +495,7 @@ firewall:
               portgroups: *portgroupshost
             heavynode:
               portgroups: *portgroupshost
-            workstation:
+            desktop:
               portgroups: *portgroupshost
             customhostgroup0:
               portgroups: *portgroupshost
@@ -554,7 +554,7 @@ firewall:
               portgroups: *portgroupsdocker
             analyst:
               portgroups: *portgroupsdocker
-            workstation:
+            desktop:
               portgroups: *portgroupsdocker
             customhostgroup0:
               portgroups: *portgroupsdocker
@@ -596,7 +596,7 @@ firewall:
               portgroups: *portgroupshost
             heavynode:
               portgroups: *portgroupshost
-            workstation:
+            desktop:
               portgroups: *portgroupshost
             customhostgroup0:
               portgroups: *portgroupshost
@@ -822,7 +822,7 @@ firewall:
               portgroups: *portgroupsdocker
             analyst:
               portgroups: *portgroupsdocker
-            workstation:
+            desktop:
               portgroups: *portgroupsdocker
             customhostgroup0:
               portgroups: *portgroupsdocker

salt/manager/tools/sbin/so-firewall-minion

@@ -79,7 +79,7 @@ fi
 		'RECEIVER')
 			so-firewall includehost receiver "$IP" --apply
 			;;
-		'WORKSTATION')
+		'DESKTOP')
-			so-firewall includehost workstation "$IP" --apply
+			so-firewall includehost desktop "$IP" --apply
 			;;
     esac