Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove salt provisioning for sd-export files #298

Merged
merged 2 commits into from
Aug 9, 2019

Conversation

emkll
Copy link
Contributor

@emkll emkll commented Jul 24, 2019

Closes #271
These tasks should now be done via the securedrop-export package: https://github.com/freedomofpress/securedrop-export

Once the above package is uploaded test plan should be as follows:

  • Run make clean
  • make allcompletes without error
  • all tests pass with make test
  • USB drive export works
  • USB printing works

@emkll emkll added the blocked label Jul 30, 2019
@emkll emkll force-pushed the 271-package-send-to-usb branch 2 times, most recently from 277bb1c to 4bcd2ca Compare July 30, 2019 18:17
@emkll emkll removed the blocked label Jul 30, 2019
@emkll emkll force-pushed the 271-package-send-to-usb branch from 4bcd2ca to 81552df Compare July 31, 2019 19:25
@emkll emkll marked this pull request as ready for review August 1, 2019 14:53
@zenmonkeykstop
Copy link
Contributor

zenmonkeykstop commented Aug 9, 2019

Built and all tests pass with the exception of the policy one, due to cruft in /etc/qubes-rpc/policy/qubes.VMShell.

File and printer work without error.

Branch needs rebasing against master, however, and should probably be retested. Also the logo PNG is now part of the securedrop-export package and should not need to be added via Salt.

Will rebase and retest.

emkll added 2 commits August 9, 2019 09:36
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
The files are no longer copied so their contents cannot be verified. Let's ensure the package is insalled and the expected files are present
@conorsch
Copy link
Contributor

conorsch commented Aug 9, 2019

due to cruft in /etc/qubes-rpc/policy/qubes.VMShell.

In my experience, such cruft is usually the result of interrupted upgrades, not caused by drift in the branches for this repo. Clean up manually for now—we should aim to provide a more complete solution to the automated logic, however.

File and printer work without error.

🎉! Great news.

Will rebase and retest.

Thanks, agree that's warranted now that we have conflicts, likely due to merge of #305

@zenmonkeykstop zenmonkeykstop force-pushed the 271-package-send-to-usb branch from 2021c39 to 5572792 Compare August 9, 2019 18:03
Copy link
Contributor

@zenmonkeykstop zenmonkeykstop left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rebased and retested:

  • make all completes without error
  • all tests pass with make test, with the unrelated exception of policy checks due to a bunch of disp-mgmt- rules
  • USB drive export works
  • USB printing works

Visual inspection of diff looks good. Approved!

@zenmonkeykstop zenmonkeykstop merged commit d8e1a84 into master Aug 9, 2019
@legoktm legoktm deleted the 271-package-send-to-usb branch May 28, 2024 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Packaging securedrop export code
3 participants