[CICD-Pass] Merge 3c249d4 into cicd-release

MTecknology · May 7, 2023 · 038fb48 · 038fb48
2 parents fbc5b98 + 3c249d4
commit 038fb48
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/states/mokcert/init.sls b/states/mokcert/init.sls
@@ -32,7 +32,7 @@ mokcert-sslconf:
 
 mokcert-enroll:
   cmd.run:
-    - name: 'mokutil --timeout 800; mokutil --import /root/.mok/client.der'
+    - name: 'mokutil --timeout 0; mokutil --import /root/.mok/client.der'
     - stdin: 'GR3en\nGR3en\n'
     - unless: 'mokutil --test-key /root/.mok/client.der | grep -q "already enrolled"'
     - require:

diff --git a/states/polkit/init.sls b/states/polkit/init.sls
@@ -11,15 +11,18 @@ polkit:
     - clean: True
     - require:
       - pkg: polkit
+  {% if not salt.chroot.in_chroot() %}
   service.running:
     - name: polkit
     - enable: True
     - require:
       - pkg: polkit
     - watch:
       - file: polkit
+      - file: /etc/polkit-1/rules.d
+  {% endif %}
 
 /etc/polkit-1/rules.d:
   file.absent:
-    - watch_in:
-      - service: polkit
+    - require:
+      - pkg: polkit
diff --git a/states/top.sls b/states/top.sls
@@ -25,6 +25,11 @@ base:
     - sudo
     - users
 
+  # Server
+  'not *pc*':
+    - match: compound
+    - ssh
+
   # Laptop w/ Gnome3
   '*pc*':
     - desktop.cinnamon
@@ -33,21 +38,14 @@ base:
     - user_policies
     - signal
 
-  'mikepc*':
-    - extras.mikepc
-
-  # Test Systems
-  'test*':
-    - ssh
-
-  # Dev Systems
-  'dev*':
+  # Test/Dev Systems
+  'test* or dev*':
+    - match: compound
     - ssh
 
-  # TODO: Temporary relocation
-  'media*':
-    - ssh
   'irc*':
-    - ssh
     - irssi
     - webapps
+
+  'mikepc*':
+    - extras.mikepc