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.

Sign up for GitHub

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

Jump to bottom

Fix initial beta release docs and manifest, update version to 0.2.1 #468

Merged
merged 4 commits into from
Feb 26, 2020
Merged

Fix initial beta release docs and manifest, update version to 0.2.1 #468

merged 4 commits into from
Feb 26, 2020

Conversation

emkll
Copy link
Contributor

@emkll emkll commented Feb 24, 2020 •
edited
Loading

Status

Ready for review

Description of Changes

  • Clarifies docs to install securedrop-workstation-dom0-config in production context
  • Add dom0/*.conf to manifest and rpmspec (this was not caught in the review of Install securedrop-log and setup #447)
  • add launcher directory to /srv/salt

Testing

  • In a dev environment, make clean completes without error (and removes the launcher dir from /srv/salt)
  • We should rely on salt provisioning no-ops rather than complicating split logic (dev vs staging/prod)
  • Build RPM on this branch
  • Follow production provisioning docs
  • Install completes without error (securedrop-admin --apply)

Checklist

If you have made code changes

  • Linter (make flake8) passes in the development environment (this box may
    be left unchecked, as flake8 also runs in CI)

If you have made changes to the provisioning logic

  • All tests (make test) pass in dom0 of a Qubes install

@emkll emkll force-pushed the beta-release-tweaks branch from e7060f9 to 5fff3de Compare February 25, 2020 14:04
@emkll emkll changed the title Fix initial beta release docs and manifest Fix initial beta release docs and manifest, update version to 0.2.1 Feb 25, 2020
emkll added 3 commits February 25, 2020 10:44
@emkll
Tweak docs for clean production install
8e1ec77 
- Ensure Qubes-provided Templates and dom0 are up-to-date
- Fix yum repo path
- dnf install does not require sudo
@emkll
Add sdlog.conf to rpm spec and manifest
16b4da8
@emkll
Copy updater files to /srv/salt
ef5d1d6 
No-op, in lieu of per-scenario logic to *skip* provisioning of dom0 updater in the salt dom0 provisioning steps
Also fixes `clean` Makefile target to remove launcher directory from /srv/salt/
@emkll emkll force-pushed the beta-release-tweaks branch from 5fff3de to b0e6297 Compare February 25, 2020 15:58
@emkll emkll force-pushed the beta-release-tweaks branch from b0e6297 to a400f2a Compare February 25, 2020 16:03
@emkll
Copy link
Contributor Author

emkll commented Feb 25, 2020 •
edited
Loading

Tested this again on a fresh Qubes install with a .rpm built on this branch, and works as expected, this PR is now ready for review. Given the time it takes to go through testing, I would suggest the reviewer to simply review the diff visually, but will defer to their judgement.
As part of the review, I would like a critical look on how the dev/non-dev cases of file copies in dom0 are handled, with regard to the launcher and other dom0 files (shipping them via rpm in place, and then re-applied via salt, no-op). Should we continue copying these files to two locations? Should we instead have more branching in the code to avoid these cases?

redshiftzero
redshiftzero approved these changes Feb 25, 2020
View reviewed changes
Copy link
Contributor

@redshiftzero redshiftzero left a comment

Choose a reason for hiding this comment

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

approving this and prod instructions based on visual review

@emkll emkll mentioned this pull request Feb 25, 2020
Closed
@emkll emkll merged commit ce70266 into master Feb 26, 2020
@emkll emkll deleted the beta-release-tweaks branch February 26, 2020 14:09
@emkll emkll mentioned this pull request Feb 26, 2020
Merged
4 tasks
@emkll emkll linked an issue Feb 26, 2020 that may be closed by this pull request
Prepare initial beta prod releases of all components #464
Closed
5 tasks
cfm pushed a commit that referenced this pull request Apr 1, 2024
@emkll
Merge pull request #468 from freedomofpress/beta-release-tweaks
80d5b45 
Fix initial beta release docs and manifest, update version to 0.2.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@redshiftzero redshiftzero redshiftzero approved these changes

Assignees
No one assigned
Labels
small off-sprint PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Prepare initial beta prod releases of all components
2 participants
@emkll @redshiftzero