Fix issue blocking sd-viewer & sd-app to be marked internal

The issue was due to a double yaml intruction, which when rendered and interpreted lead to the first `set` to be ignored. Fixes: #1097
freedomofpress · Jun 26, 2024 · c11715a · c11715a
1 parent 617d88c
commit c11715a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/securedrop_salt/sd-app.sls b/securedrop_salt/sd-app.sls
@@ -30,15 +30,14 @@ sd-app:
         - sd-client
         - sd-workstation
     - features:
-    {% if d.environment == "prod" %}
       - set:
+        - vm-config.SD_MIME_HANDLING: sd-app
+{% if d.environment == "prod" %}
         - internal: 1
-    {% endif %}
+{% endif %}
       - enable:
         - service.paxctld
         - service.securedrop-mime-handling
-      - set:
-        - vm-config.SD_MIME_HANDLING: sd-app
     - require:
       - qvm: sd-small-{{ sdvars.distribution }}-template
 

diff --git a/securedrop_salt/sd-viewer.sls b/securedrop_salt/sd-viewer.sls
@@ -38,15 +38,14 @@ sd-viewer:
         - sd-viewer-vm
         - sd-{{ sdvars.distribution }}
     - features:
-    {% if d.environment == "prod" %}
       - set:
+        - vm-config.SD_MIME_HANDLING: sd-viewer
+{% if d.environment == "prod" %}
         - internal: 1
-    {% endif %}
+{% endif %}
       - enable:
         - service.paxctld
         - service.securedrop-mime-handling
-      - set:
-        - vm-config.SD_MIME_HANDLING: sd-viewer
     - require:
       - qvm: sd-large-{{ sdvars.distribution }}-template