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

Add migration instructions for v3 instances and clarify migration paths #168

Merged
merged 2 commits into from
Mar 9, 2021

Conversation

rocodes
Copy link
Contributor

@rocodes rocodes commented Mar 8, 2021

Status

Ready for review
Replaces #133

Description of Changes

  • Description: Add backup and restore information for v3 instances. Add detailed hardware migration information. Include information on migration with preserve-tor-config flag.

Testing

  • visual review

Release

  • n/a

Checklist (Optional)

  • Doc linting (make docs-lint) passed locally
  • Doc link linting (make docs-linkcheck) passed
  • You have previewed (make docs) docs at http://localhost:8000

@rocodes rocodes force-pushed the backup-restore-migrate branch from cb92362 to d89735f Compare March 8, 2021 21:42
@rocodes
Copy link
Contributor Author

rocodes commented Mar 9, 2021

@eloquence: I moved the instructions in v3_update_common out of the includes and back into the migration docs. They're now only used once (as opposed to being duplicated for v2+v3, and v3), and I think our future selves will thank us. I know it creates a big diff, but the changes in this PR are pretty much just the ones you requested.

cd ~/Persistent/securedrop
export SD_OLD="~/Persistent/sd.bak/install_files/ansible-base"
export SD_NEW="~/Persistent/securedrop/install_files/ansible-base"
cp $SD_OLD/group_vars/all/site-specific $SD_NEW/group_vars/all/site-specific
Copy link
Member

Choose a reason for hiding this comment

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

In case folks type those commands by hand (and to make them easier to read), I would suggest omitting the destination filename in all cp operations where it is not modified. So:

cp $SD_OLD/group_vars/all/site-specific $SD_NEW/group_vars/all/
cp $SD_OLD/tor_v3_keys.json $SD_NEW/
cp $SD_OLD/sd-backup-old.tar.gz $SD_NEW/
cp $SD_OLD/SecureDrop.asc $SD_NEW/
cp $SD_OLD/ossec.asc $SD_NEW/
cp $SD_OLD/journalist.asc $SD_NEW/

This is done further below for some of the commands.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

gotcha, fixed in 7f2b421

@eloquence
Copy link
Member

eloquence commented Mar 9, 2021

Thanks @rocodes, this looks great to me. The comments I left are minor, and I'd be fine to merge as-is if push comes to shove, but see what you think. (We can tweak further during final QA as needed.)

…cludes directive back into migration doc since it is now only used once.
@rocodes rocodes force-pushed the backup-restore-migrate branch from 2e6a9b3 to 7f2b421 Compare March 9, 2021 14:46
@rocodes rocodes requested a review from eloquence March 9, 2021 16:43
Copy link
Member

@eloquence eloquence left a comment

Choose a reason for hiding this comment

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

Looks great. With the revised release schedule, I'm hoping we'll have time tomorrow to step through a full migration following these docs, once #169 also lands.

@eloquence eloquence merged commit 369d336 into main Mar 9, 2021
@legoktm legoktm deleted the backup-restore-migrate branch May 28, 2024 21:13
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.

2 participants