diff --git a/files/sdw-admin.py b/files/sdw-admin.py index ab98c6f9..a8221b85 100755 --- a/files/sdw-admin.py +++ b/files/sdw-admin.py @@ -203,9 +203,10 @@ def sync_appmenus(): run_cmd(["qvm-sync-appmenus", "whonix-gateway-17"]) run_cmd(["qvm-shutdown", "whonix-gateway-17"]) - # These are the two ones we show in prod VMs, so sync explicitly + # These are the ones we show in prod VMs, so sync explicitly run_cmd(["qvm-sync-appmenus", "--regenerate-only", "sd-devices"]) run_cmd(["qvm-sync-appmenus", "--regenerate-only", "sd-whonix"]) + run_cmd(["qvm-sync-appmenus", "--regenerate-only", "sd-log"]) def validate_config(path): diff --git a/securedrop_salt/sd-log.sls b/securedrop_salt/sd-log.sls index 228c689a..b99966a6 100644 --- a/securedrop_salt/sd-log.sls +++ b/securedrop_salt/sd-log.sls @@ -32,15 +32,13 @@ sd-log: - add: - sd-workstation - features: - {% if d.environment == "prod" %} - - set: - - internal: 1 - {% endif %} - enable: - service.paxctld - service.redis - service.securedrop-logging-disabled - service.securedrop-log-server + - set: + - menu-items: "org.gnome.Nautilus.desktop" - require: - qvm: sd-small-{{ sdvars.distribution }}-template diff --git a/tests/test_vms_exist.py b/tests/test_vms_exist.py index 9687c70b..340fee62 100644 --- a/tests/test_vms_exist.py +++ b/tests/test_vms_exist.py @@ -34,7 +34,7 @@ def test_expected(self): @unittest.skipIf(CONFIG["environment"] != "prod", "Skipping on non-prod system") def test_internal(self): - not_internal = ["sd-proxy", "sd-whonix", "sd-devices"] + not_internal = ["sd-proxy", "sd-whonix", "sd-devices", "sd-log"] for vm_name in SD_VMS: if vm_name in not_internal: