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

Updates dom0 repo URL #349

Merged
merged 5 commits into from Nov 25, 2019
Merged

Updates dom0 repo URL #349

merged 5 commits into from Nov 25, 2019

Conversation

conorsch
Copy link
Contributor

Moves the package backend for dom0-specific RPM hosting from S3 buckets to git-lfs-backed storage. Now, PRs into https://github.com/freedomofpress/securedrop-workstation-dev-rpm-packages-lfs will result in packages automatically being served up to dom0.

Since the S3 buckets (for the purposes of RPM hosting) are obsolete after merge of this PR, we also remove the scripting in this repo required to push packages manually from developer workstations (see #342).

Also includes some minor fixes, therefore:

Review

Before performing functional review, consider the following:

  • Is the URL appropriate? Right now it's https://yum.securedrop.org/workstation/dom0/f25/; perhaps we shold be using the "yum-test" subdomain, to distinguish between prod/test, same as we do with e.g. apt{,-test}.freedom.press.

Testing

In order to test that the repo is correctly configured, you must purge RPM packages from dom0. It'll take a while to pull in and install the new ones, so consider obtaining caffeine through your favorite method while the below tasks are running.

make clone
make clean
sudo dnf remove -y qubes-template-securedrop-workstation
qvm-check securedrop-workstation # should show an error, because it's now missing!
make all
qvm-check securedrop-workstation # should report success, because it's been reinstalled

Conor Schaefer added 4 commits November 21, 2019 15:22
Migrating away from the S3-bucket hosting for RPMs, and towards a
git-lfs-backed solution, same as we're using for the deb packages.

Purges the "publish-rpm" logic, since that's no longer necessary.
Updated documentation where appropriate.
We were only declaring Python requirements in order to pull in AWS
tooling for managing S3 buckets. Since we've migrated to git-lfs for
hosting the RPM packages, these requirements are no longer necessary.

Hat tip to @creviera & @redshiftzero for the hard work on migrating
Pipfile -> requirements.txt so recently.
The line was being appended every time, rather than being enforced as
present once. Closes #347.
@@ -38,7 +38,7 @@ dom0-workstation-rpm-repo:
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-securedrop-workstation-test
enabled=1
baseurl=https://dev-bin.ops.securedrop.org/dom0-rpm-repo/
baseurl=https://yum.securedrop.org/workstation/dom0/f25
Copy link
Contributor

Choose a reason for hiding this comment

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

ah yeah you're right we should make this yum-test so it's clear this is not for production use

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Roger, agreed: I'll update the URL here and re-ping for review.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated, ready for full review.

Copy link
Contributor

Choose a reason for hiding this comment

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

I wish for it to be rpm.securedrop.org as yum is already obsolete.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wish for it to be rpm.securedrop.org as yum is already obsolete.

The only reason I chose "yum{,-test}" is that's what the Qubes repo use: https://yum.qubes-os.org/ Since we're still in dev, we can change the URL again in the near future, but it'll take some coordination with the backend.

We'll reserve the non-test URLs for stable versions. For now, we're
still slinging nightlies around, so let's be clear about expectations.
@eloquence eloquence added this to Ready for Review in SecureDrop Team Board Nov 23, 2019
Copy link
Contributor

@kushaldas kushaldas left a comment

Choose a reason for hiding this comment

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

Worked as suggested. Tested from a clean state.

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.

changes lgtm, verified test plan and also ensured that another line was not added to /rw/config/rc.local in sys-firewall

@redshiftzero redshiftzero merged commit 1e06cf7 into master Nov 25, 2019
SecureDrop Team Board automation moved this from Ready for Review to Done Nov 25, 2019
@redshiftzero redshiftzero deleted the migrate-dom0-repo-url branch November 25, 2019 17:27
conorsch pushed a commit that referenced this pull request Nov 26, 2019
Should have been included as part of #349. That's what I get for
omitting `make test` as part of the test plan. =)
emkll added a commit that referenced this pull request Nov 27, 2019
Reflects yum repo changes introduced in #349
emkll added a commit that referenced this pull request Nov 27, 2019
Reflects yum repo changes introduced in #349
emkll added a commit that referenced this pull request Nov 27, 2019
Reflects yum repo changes introduced in #349
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

RPM key script appends same line to end of rc.local make clone should default to sd-dev VM
3 participants