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

securedrop-config: remove function setting HiddenServiceVersion #4690

Merged
merged 1 commit into from
Aug 26, 2019

Conversation

redshiftzero
Copy link
Contributor

Status

Ready for review

Description of Changes

Fixes #4676

For new installs that wish to use v2, the HiddenServiceVersion
will be set via the torrc template in the tor-hidden-services
Ansible role.

For existing installs that still wish to use v2, if they have
updated to Xenial, then they already have this HiddenServiceVersion
set to 2 in their existing torrc. Installs not on Xenial
are no longer supported.

Testing

Mostly inspecting my logic above and agreeing this securedrop-config postinst logic is no longer needed for current installs is what is needed: since this test https://github.com/freedomofpress/securedrop/blob/develop/molecule/testinfra/staging/app/test_tor_hidden_services.py#L84 ensures that the hidden service version is set to 2 for new installs.

Deployment

[covered by main PR description]

Checklist

If you made changes to the system configuration:

For new installs that wish to use v2, the HiddenServiceVersion
will be set via the torrc template in the tor-hidden-services
Ansible role.

For existing installs that still wish to use v2, if they have
updated to Xenial, then they already have this HiddenServiceVersion
set to 2 in their existing torrc. Installs _not_ on Xenial
are no longer supported.
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.

Approved.

onion1

@kushaldas kushaldas merged commit cae0164 into develop Aug 26, 2019
@kushaldas kushaldas deleted the torrc-munging-remove branch August 26, 2019 06:29
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.

Ensure torrc munging in postinst does not conflict with changes introduced for v3 onion services
2 participants