From 7c5b1780d671fe33fc1c6e1cc396e926a754fadf Mon Sep 17 00:00:00 2001 From: Ro Date: Wed, 14 Aug 2024 11:10:50 -0400 Subject: [PATCH] Remove Salt logic installing libreoffice, since it can now be managed as a dependency of securedrop-export and securedrop-viewer packages (see securedrop-client/pull/#2166). --- securedrop_salt/sd-devices-files.sls | 9 --------- securedrop_salt/sd-viewer-files.sls | 8 -------- 2 files changed, 17 deletions(-) diff --git a/securedrop_salt/sd-devices-files.sls b/securedrop_salt/sd-devices-files.sls index 33f3c2dd..a1f5e71f 100644 --- a/securedrop_salt/sd-devices-files.sls +++ b/securedrop_salt/sd-devices-files.sls @@ -12,15 +12,6 @@ include: - securedrop_salt.fpf-apt-repo - securedrop_salt.sd-logging-setup -# Libreoffice needs to be installed here to convert to pdf to allow printing -sd-devices-install-libreoffice: - pkg.installed: - - name: libreoffice - - retry: - attempts: 3 - interval: 60 - - install_recommends: False - # Install securedrop-export package https://github.com/freedomofpress/securedrop-export sd-devices-install-package: pkg.installed: diff --git a/securedrop_salt/sd-viewer-files.sls b/securedrop_salt/sd-viewer-files.sls index e3f681d7..db8ccb1a 100644 --- a/securedrop_salt/sd-viewer-files.sls +++ b/securedrop_salt/sd-viewer-files.sls @@ -20,11 +20,3 @@ sd-viewer-install-metapackage: - securedrop-workstation-viewer - require: - sls: securedrop_salt.fpf-apt-repo - -sd-viewer-install-libreoffice: - pkg.installed: - - name: libreoffice - - retry: - attempts: 3 - interval: 60 - - install_recommends: False