Enable sdw-notify.timer for all users in rpm %post instead of via Salt.

freedomofpress · Jun 18, 2024 · 710318f · 710318f
1 parent 5176183
commit 710318f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/rpm-build/SPECS/securedrop-workstation-dom0-config.spec b/rpm-build/SPECS/securedrop-workstation-dom0-config.spec
@@ -164,6 +164,9 @@ systemctl enable securedrop-logind-override-disable.service
 systemctl --global enable securedrop-user-xfce-icon-size.service ||:
 systemctl --global enable securedrop-user-xfce-settings.service ||:
 
+# Enable notification timer
+systemctl --global enable sdw-notify.timer ||:
+
 %preun
 # If we're uninstalling (vs upgrading)
 if [ $1 -eq 0 ]; then

diff --git a/securedrop_salt/sd-dom0-systemd.sls b/securedrop_salt/sd-dom0-systemd.sls
diff --git a/securedrop_salt/sd-workstation.top b/securedrop_salt/sd-workstation.top
@@ -5,7 +5,6 @@ base:
   dom0:
     - securedrop_salt.sd-sys-vms
     - securedrop_salt.sd-dom0-files
-    - securedrop_salt.sd-dom0-systemd
     - securedrop_salt.sd-base-template
     - securedrop_salt.sd-workstation-template
     - securedrop_salt.sd-upgrade-templates