-
Notifications
You must be signed in to change notification settings - Fork 687
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
Removes v2 service configuration and setup support #5915
Conversation
- Removes the options to select v2 and/or v3 in sdconfig. v3 is the only option available, so no need to prompt - Removes ansible tasks and defaults related to v2 service setup, and cleans up conditionals around v3 config - Removes tailsconfig tasks and defauls related to v2 services
3777551
to
40c55ff
Compare
b9a6fa3
to
a65bbd1
Compare
Codecov Report
@@ Coverage Diff @@
## develop #5915 +/- ##
========================================
Coverage 85.39% 85.39%
========================================
Files 53 53
Lines 3904 3904
Branches 485 485
========================================
Hits 3334 3334
Misses 457 457
Partials 113 113 Continue to review full report at Codecov.
|
a65bbd1
to
0e74ac2
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @zenmonkeykstop , changes LGTM, went through the test plan and visual review of the changes. I've opened freedomofpress/securedrop-docs#207 to track the documentation changes, which should be merged prior to releasing the changes introduced here.
# v2 Tor onion services are on / v3 Tor onion services are off by default for backwards | ||
# compatibility. Note that new installs after 1.0 will have v3 enabled by sdconfig which | ||
# will override these variables. | ||
v2_onion_services: true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
these vars might linger in a site-specific file of existing instances, but since they are no longer used that should be fine
Status
Ready for review
Description of Changes
Closes #5731 .
Testing
Perform a from-scratch prod install with ssh-over-tor:
sdconfig
tailsconfig
completes successfully and only v3 desktops and ssh configs are created.Perform a from-scratch prod install with ssh-over-lan:
Run the install playbook against an existing 1.8.1 Focal instance:
tailsconfig
completes successfully and only v3 desktops and ssh configs are created.Deployment
Changes are deployed with admin workstation update (manual or GUI). In terms of server-side impact there should be no need for admin intervention or postint-style changes, as all new instances are v3-only anyway, and all instances must transition to Focal to remain accessible. The config files created by this branch are unchanged from those from a 1.8.0 or greater Focal install, with the exception of
site-specific
, which will now not contain the{v2,v3}_onion_services
variables.Checklist
If you made changes to the server application code:
make lint
) and tests (make test
) pass in the development containerIf you made changes to the system configuration:
If you added or removed a file deployed with the application:
If you made non-trivial code changes:
Choose one of the following: