Merge pull request #1162 from freedomofpress/remove-salt-libreoffice

Remove Salt logic installing libreoffice
freedomofpress · Aug 23, 2024 · f493665 · f493665
2 parents e8f30d4 + ea79a48
commit f493665
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 17 deletions.
diff --git 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
@@ -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