Skip to content

Commit

Permalink
Remove salt provisioning for sd-export files
Browse files Browse the repository at this point in the history
These tasks should now be done via the securedrop-export package: https://github.com/freedomofpress/securedrop-export
Install securedrop-export package in sd-export-template
  • Loading branch information
emkll committed Jul 31, 2019
1 parent 7b4ee1e commit 81552df
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 582 deletions.
60 changes: 4 additions & 56 deletions dom0/sd-export-files.sls
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,6 @@
include:
- fpf-apt-test-repo

sd-export-template-install-packages:
pkg.installed:
- pkgs:
- cryptsetup
- cups
- task-print-server
- system-config-printer
- xpp
- libcups2-dev
- python3-dev
- libtool-bin
- unoconv

# Libreoffice needs to be installed here to convert to pdf to allow printing
sd-export-install-libreoffice:
pkg.installed:
Expand All @@ -33,47 +20,8 @@ sd-export-install-libreoffice:
interval: 60
- install_recommends: False

sd-export-send-to-usb-script:
file.managed:
- name: /usr/bin/send-to-usb
- source: salt://sd/sd-export/send-to-usb
- user: root
- group: root
- mode: 755
- makedirs: True

sd-export-desktop-file:
file.managed:
- name: /usr/share/applications/send-to-usb.desktop
- source: salt://sd/sd-export/send-to-usb.desktop
- user: root
- group: root
- mode: 644
- makedirs: True
cmd.run:
- name: sudo update-desktop-database /usr/share/applications
- require:
- file: sd-export-desktop-file

sd-export-file-format:
file.managed:
- name: /usr/share/mime/packages/application-x-sd-export.xml
- source: salt://sd/sd-export/application-x-sd-export.xml
- user: root
- group: root
- mode: 644
- makedirs: True
cmd.run:
- name: sudo update-mime-database /usr/share/mime
- require:
- file: sd-export-file-format
- file: sd-export-desktop-file
# Install securedrop-export package https://github.com/freedomofpress/securedrop-export
sd-export-install-package:
pkg.installed:
- name: securedrop-export

sd-export-securedrop-icon:
file.managed:
- name: /usr/share/securedrop/icons/sd-logo.png
- source: salt://sd/sd-proxy/logo-small.png
- user: root
- group: root
- mode: 644
- makedirs: True
7 changes: 0 additions & 7 deletions sd-export/application-x-sd-export.xml

This file was deleted.

Loading

0 comments on commit 81552df

Please sign in to comment.