full path import statements on sls requirements

freedomofpress · May 31, 2024 · b796dce · b796dce
1 parent 53e4782
commit b796dce
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 29 deletions.
diff --git a/securedrop_salt/sd-app-files.sls b/securedrop_salt/sd-app-files.sls
@@ -19,4 +19,4 @@ install-securedrop-client-package:
     - pkgs:
       - securedrop-client
     - require:
-      - sls: fpf-apt-repo
+      - sls: securedrop_salt.fpf-apt-repo
diff --git a/securedrop_salt/sd-base-template-files.sls b/securedrop_salt/sd-base-template-files.sls
@@ -24,4 +24,4 @@ sd-base-template-install-securedrop-packages:
       - securedrop-workstation-config
       - securedrop-workstation-grsec
     - require:
-      - sls: fpf-apt-repo
+      - sls: securedrop_salt.fpf-apt-repo
diff --git a/securedrop_salt/sd-devices-files.sls b/securedrop_salt/sd-devices-files.sls
@@ -26,4 +26,4 @@ sd-devices-install-package:
   pkg.installed:
     - name: securedrop-export
     - require:
-      - sls: fpf-apt-repo
+      - sls: securedrop_salt.fpf-apt-repo
diff --git a/securedrop_salt/sd-gpg.sls b/securedrop_salt/sd-gpg.sls
@@ -33,5 +33,5 @@ sd-gpg:
       - add:
         - sd-workstation
     - require:
-      - sls: sd-workstation-template
-      - sls: sd-upgrade-templates
+      - sls: securedrop_salt.sd-workstation-template
+      - sls: securedrop_salt.sd-upgrade-templates
diff --git a/securedrop_salt/sd-logging-setup.sls b/securedrop_salt/sd-logging-setup.sls
@@ -12,7 +12,7 @@ install-securedrop-log-package:
     - pkgs:
       - securedrop-log
     - require:
-      - sls: fpf-apt-repo
+      - sls: securedrop_salt.fpf-apt-repo
 
 {% endif %}
 

diff --git a/securedrop_salt/sd-proxy-template-files.sls b/securedrop_salt/sd-proxy-template-files.sls
@@ -10,4 +10,4 @@ install-securedrop-proxy-package:
     - pkgs:
       - securedrop-proxy
     - require:
-      - sls: fpf-apt-repo
+      - sls: securedrop_salt.fpf-apt-repo
diff --git a/securedrop_salt/sd-remove-unused-templates.sls b/securedrop_salt/sd-remove-unused-templates.sls
@@ -5,23 +5,23 @@
 # Make sure the "prepare" step has run first, otherwise there's
 # a race between migration and removal.
 include:
-  - sd-upgrade-templates
-  - sd-log
-  - sd-devices
-  - sd-gpg
-  - sd-proxy
-  - sd-viewer
-  - sd-app
+  - securedrop_salt.sd-upgrade-templates
+  - securedrop_salt.sd-log
+  - securedrop_salt.sd-devices
+  - securedrop_salt.sd-gpg
+  - securedrop_salt.sd-proxy
+  - securedrop_salt.sd-viewer
+  - securedrop_salt.sd-app
 
 run-remove-upgrade-scripts:
   cmd.script:
     - name: salt://securedrop-handle-upgrade
     - args: remove
     - require:
-      - sls: sd-upgrade-templates
-      - sls: sd-log
-      - sls: sd-devices
-      - sls: sd-gpg
-      - sls: sd-proxy
-      - sls: sd-viewer
-      - sls: sd-app
+      - sls: securedrop_salt.sd-upgrade-templates
+      - sls: securedrop_salt.sd-log
+      - sls: securedrop_salt.sd-devices
+      - sls: securedrop_salt.sd-gpg
+      - sls: securedrop_salt.sd-proxy
+      - sls: securedrop_salt.sd-viewer
+      - sls: securedrop_salt.sd-app
diff --git a/securedrop_salt/sd-sys-whonix-vms.sls b/securedrop_salt/sd-sys-whonix-vms.sls
@@ -27,7 +27,7 @@ dom0-enabled-apparmor-on-whonix-gw-template:
     - prefs:
       - kernelopts: "nopat apparmor=1 security=apparmor"
     - require:
-      - sls: sd-upgrade-templates
+      - sls: securedrop_salt.sd-upgrade-templates
       - qvm: whonix-gateway-installed
       - qvm: whonix-workstation-installed
 
@@ -37,7 +37,7 @@ dom0-enabled-apparmor-on-whonix-ws-template:
     - prefs:
       - kernelopts: "nopat apparmor=1 security=apparmor"
     - require:
-      - sls: sd-upgrade-templates
+      - sls: securedrop_salt.sd-upgrade-templates
       - qvm: whonix-gateway-installed
       - qvm: whonix-workstation-installed
 

diff --git a/securedrop_salt/sd-viewer-files.sls b/securedrop_salt/sd-viewer-files.sls
@@ -19,7 +19,7 @@ sd-viewer-install-metapackage:
     - pkgs:
       - securedrop-workstation-viewer
     - require:
-      - sls: fpf-apt-repo
+      - sls: securedrop_salt.fpf-apt-repo
 
 sd-viewer-install-libreoffice:
   pkg.installed:

diff --git a/securedrop_salt/sd-whonix.sls b/securedrop_salt/sd-whonix.sls
@@ -35,8 +35,8 @@ sd-whonix:
         - sd-workstation
         - sd-{{ sdvars.distribution }}
     - require:
-      - sls: sd-upgrade-templates
-      - sls: sd-sys-whonix-vms
+      - sls: securedrop_salt.sd-upgrade-templates
+      - sls: securedrop_salt.sd-sys-whonix-vms
 
 {% import_json "securedrop_salt/config.json" as d %}
 

diff --git a/securedrop_salt/sd-workstation-template-files.sls b/securedrop_salt/sd-workstation-template-files.sls
@@ -9,7 +9,7 @@ sd-workstation-template-install-kernel-config-packages:
       - securedrop-workstation-config
       - securedrop-workstation-grsec
     - require:
-      - sls: fpf-apt-repo
+      - sls: securedrop_salt.fpf-apt-repo
 
 # Ensure that paxctld starts immediately. For AppVMs,
 # use qvm.features.enabled = ["paxctld"] to ensure service start.

diff --git a/securedrop_salt/sd-workstation-template.sls b/securedrop_salt/sd-workstation-template.sls
@@ -30,7 +30,7 @@ sd-small-{{ sdvars.distribution }}-template:
       - enable:
         - service.paxctld
     - require:
-      - sls: sd-base-template
+      - sls: securedrop_salt.sd-base-template
 
 sd-large-{{ sdvars.distribution }}-template:
   qvm.vm:
@@ -49,4 +49,4 @@ sd-large-{{ sdvars.distribution }}-template:
       - enable:
         - service.paxctld
     - require:
-      - sls: sd-base-template
+      - sls: securedrop_salt.sd-base-template