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

added Xenial prep instructions in upgrade section #4046

Merged

Conversation

zenmonkeykstop
Copy link
Contributor

Status

Ready for review

Description of Changes

Fixes #4044 .

Adds a new page to the Upgrade section covering steps required to upgrade workstations in preparation for Xenial migration.

Note that #4044 seems to be a bit more general, but this document is specifically to support the Xenial migration and associated messaging.

Testing

This is a docs-only PR but it also contains upgrade procedures:

  • read for clarity and typos/errors
  • test the update procedures described for Tails workstations with versions 0.91, 0.4.1, and 0.3.12

Checklist

If you made changes to documentation:

  • Doc linting (make docs-lint) passed locally

Copy link
Contributor

@heartsucker heartsucker left a comment

Choose a reason for hiding this comment

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

Looking good. Some comments inline (mostly formatting). There's a few cases of missing code block formatting that makes the code samples look like this:

screenshot_2019-01-18 xenial migration - preparatory steps securedrop 0 12 0 rc1 documentation

Additionally, we may want to use both the Ubuntu version number and code name in every instance because it might not be obvious to someone unfamiliar (say, a Windows admin) that 16.04 == Xenial and 14.04 == Trusty.

I don't have hardware to test this on, so I can't verify that it does the thang tho.

docs/upgrade/xenial_prep.rst Outdated Show resolved Hide resolved
docs/upgrade/xenial_prep.rst Outdated Show resolved Hide resolved
docs/upgrade/xenial_prep.rst Outdated Show resolved Hide resolved
docs/upgrade/xenial_prep.rst Outdated Show resolved Hide resolved
docs/upgrade/xenial_prep.rst Outdated Show resolved Hide resolved
docs/upgrade/xenial_prep.rst Outdated Show resolved Hide resolved
docs/upgrade/xenial_prep.rst Show resolved Hide resolved
docs/upgrade/xenial_prep.rst Outdated Show resolved Hide resolved
docs/upgrade/xenial_prep.rst Outdated Show resolved Hide resolved
docs/upgrade/xenial_prep.rst Outdated Show resolved Hide resolved
@zenmonkeykstop zenmonkeykstop force-pushed the docs-xenial-prep-guide branch 2 times, most recently from e24a183 to 668f951 Compare January 18, 2019 20:05
@redshiftzero
Copy link
Contributor

hey @kushaldas: on Monday can you spin through a test of these docs since you have fresh eyes on this PR? (This will be part of the announcement that goes out next week about Xenial)


git checkout 0.11.0

Important: If you see the warning ``refname ‘0.11.0’ is ambiguous`` in the output, we recommend that you contact us immediately at [email protected] (GPG encrypted).
Copy link
Contributor

Choose a reason for hiding this comment

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

This should probably be a .. warning:: block.

Copy link
Contributor

@kushaldas kushaldas Jan 21, 2019

Choose a reason for hiding this comment

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

Yup. 👍 to @heartsucker's comment. We need this as an important block.


.. code:: sh

git checkout 0.11.0
Copy link
Contributor

Choose a reason for hiding this comment

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

We should probably include the `refname '0.11.0' is ambiguous" warning here too.


Next, you’ll need to copy over the instance’s submission key and OSSEC public key. Their filenames may vary, but you can check them in the instance configuration file using the following command:

grep "_public_key" $DST/prod-specific.yml
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm somewhat not a fan of the inline comments here and think it makes more sense to put all the text at the top and just leave this as shell commands only. I think this might be unclear for some admins. Maybe another reviewer has an opinion on this?

@heartsucker heartsucker dismissed their stale review January 19, 2019 05:07

Dismissing my review to not block since the docs are worded well enough to make me happy for merge :D

Checking your Server Securedrop version
---------------------------------------

The simplest way to check your SecureDrop version is to load the .onion address of your Source Interface in the Tor Browser. The version number will be in the footer of the Source Interface. You can also check the application version from the command line on the *Application Server* by running the command:
Copy link
Contributor

Choose a reason for hiding this comment

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

let us add a screenshot here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added.

docs/upgrade/xenial_prep.rst Outdated Show resolved Hide resolved

git checkout 0.11.0

Important: If you see the warning ``refname ‘0.11.0’ is ambiguous`` in the output, we recommend that you contact us immediately at [email protected] (GPG encrypted).
Copy link
Contributor

@kushaldas kushaldas Jan 21, 2019

Choose a reason for hiding this comment

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

Yup. 👍 to @heartsucker's comment. We need this as an important block.

Copy link
Contributor

@emkll emkll left a comment

Choose a reason for hiding this comment

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

I've focused testing on the instructions for the 0.3.x migration:
Using 0.11.0 prod vms, I've destroyed the the workstation (while preserving the secrets necessary for the migration). I've also recreated a prod-specific.yml file based on the configuration of the VMs. I've then checked out 0.3.12 and ran install.sh in tails_files. Then checked out 0.11.0 and walked through the instructions provided in this PR.

Everything works as expected: I've tried ./securedrop-admin {tailsconfig, backup, sdconfig, install, restore} . Note my comment on SRC path for copying sd-relevant files, can you confirm the path is correct? Other than that, other minor comments (inline).

Once SRC path is confirmed, based this my review and thorough review by others, this is good to merge.

docs/upgrade/xenial_prep.rst Outdated Show resolved Hide resolved
docs/upgrade/xenial_prep.rst Outdated Show resolved Hide resolved
docs/upgrade/xenial_prep.rst Show resolved Hide resolved
Copy link
Contributor

@emkll emkll left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for the fixes @zenmonkeykstop

@redshiftzero redshiftzero dismissed kushaldas’s stale review January 23, 2019 01:10

hey kushal, dismissing your review as I think your comments were addressed here and we want to get these comms out EOD <3

@redshiftzero redshiftzero merged commit 5bbd3fa into freedomofpress:develop Jan 23, 2019
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.

5 participants