Merge pull request #1161 from freedomofpress/no-duplicate-template-st…

…ates Refactor: Avoid duplicative salt states
freedomofpress · Sep 23, 2024 · 7778e98 · 7778e98
2 parents 2860ca2 + 3b61aea
commit 7778e98
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 26 deletions.
diff --git a/securedrop_salt/sd-base-template-files.sls → ...redrop_salt/sd-base-template-packages.sls b/securedrop_salt/sd-base-template-files.sls → ...redrop_salt/sd-base-template-packages.sls
@@ -21,3 +21,13 @@ sd-base-template-install-securedrop-packages:
       - securedrop-workstation-grsec
     - require:
       - sls: securedrop_salt.fpf-apt-repo
+
+# Ensure that paxctld starts immediately. For AppVMs,
+# use qvm.features.enabled = ["paxctld"] to ensure service start.
+sd-workstation-template-enable-paxctld:
+  service.running:
+    - name: paxctld
+    - enable: True
+    - reload: True
+    - require:
+      - pkg: sd-base-template-install-securedrop-packages
diff --git a/securedrop_salt/sd-workstation-template-files.sls b/securedrop_salt/sd-workstation-template-files.sls
diff --git a/securedrop_salt/sd-workstation.top b/securedrop_salt/sd-workstation.top
@@ -20,16 +20,13 @@ base:
     - securedrop_salt.sd-remove-unused-templates
 
   sd-base-bookworm-template:
-    - securedrop_salt.sd-base-template-files
-    - securedrop_salt.sd-workstation-template-files
+    - securedrop_salt.sd-base-template-packages
   sd-small-bookworm-template:
     - securedrop_salt.sd-logging-setup
-    - securedrop_salt.sd-workstation-template-files
     - securedrop_salt.sd-app-files
     - securedrop_salt.sd-proxy-template-files
   sd-large-bookworm-template:
     - securedrop_salt.sd-logging-setup
-    - securedrop_salt.sd-workstation-template-files
     - securedrop_salt.sd-devices-files
     - securedrop_salt.sd-viewer-files
   sd-gpg: