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

Update Install Guide for 4.2 #228

Merged
merged 2 commits into from
Jul 12, 2024
Merged

Update Install Guide for 4.2 #228

merged 2 commits into from
Jul 12, 2024

Conversation

nathandyer
Copy link
Contributor

This PR updates the install guide to reference all the changes users will now encounter as they step through an installation using Qubes 4.2. While most of these changes a fairly straightforward (for example, updating the locations of items inside the Qubes menu), a few of the changes I've made should be made explicit here:

  • I've added a warning to the top of the prepare and install pages noting that not all packages are available in the repos, and that these instructions will not work until that happens. We should remove this once 1.0.0 is released and packages are available on yum.securedrop.org.
  • Likewise, there are links to the Qubes 4.2.2-rc1 iso (mainly as a placeholder) that need to be updated to stable 4.2.2 once that is ready.
  • I removed the Fedora 40 upgrade guide, and the references to it within; from here forward, no Workstation users will encounter a situation where they would need to manually upgrade to the Fedora 40 template.
  • I've expanded the docs in a few small ways, such as noting that the "Unable to unlock 'TailsData'" warning is to be expected, and to make it explicit how to easily verify the Qubes ISO

Testing

  • Visual review
  • CI passes

@legoktm legoktm self-assigned this Jul 10, 2024
Copy link
Member

@legoktm legoktm left a comment

Choose a reason for hiding this comment

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

Flagged a few things. Per discussion let's change the Qubes URLs to point to a future 4.2.2 release, if it's not ready by the time we go stable we can change it down to 4.2.1 and restore the upgrade Fedora instructions.

Erik had a few more things in #222, do you want to cherry-pick those here too?

@@ -76,9 +83,9 @@ Users of SecureDrop Workstation must enter their username, passphrase and two-fa

In order to set up KeePassXC for easy use:

- Add KeePassXC to the application menu by selecting it from the list of available apps in **Q > Domain: vault > vault: Qube Settings > Applications** and pressing the button labeled **>** (do not press the button labeled **>>**, which will add *all* applications to the menu).
- Add KeePassXC to the application menu by selecting it from the list of available apps in **Q > Apps > vault > Settings > Applications** and pressing the button labeled **>** (do not press the button labeled **>>**, which will add *all* applications to the menu).
Copy link
Member

Choose a reason for hiding this comment

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

This is a pre-existing issue, but "Applications" is part of a separate menu, and I think it's misleading to make it think it's part of the same Q menu.

(Not asking for a fix, just flagging for a future potential improvement)

Copy link
Contributor

Choose a reason for hiding this comment

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

I would vote to fix it while we're in here!

docs/admin/install/install.rst Show resolved Hide resolved
docs/admin/install/prepare.rst Outdated Show resolved Hide resolved
docs/admin/install/prepare.rst Outdated Show resolved Hide resolved
docs/admin/install/prepare.rst Outdated Show resolved Hide resolved
docs/admin/install/prepare.rst Show resolved Hide resolved
@nathandyer nathandyer force-pushed the qubes-42-install-changes branch from fa217d4 to ba30e96 Compare July 10, 2024 22:18
docs/admin/install/install.rst Outdated Show resolved Hide resolved
|Unlock TailsData|

- Open a ``dom0`` terminal via **Q > Terminal Emulator**, and run the following command to list the SVS submission key details, including its fingerprint:
- Open a ``dom0`` terminal via **Q > Settings Gear > Other > Xfce Terminal**, and run the following command to list the SVS submission key details, including its fingerprint:
Copy link
Contributor

Choose a reason for hiding this comment

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

If we can't have the gear icon specifically, this should read something like "Open the Q menu, select the gear icon on the left-hand side, and select Other > XFCE terminal to open a terminal in dom0"

Copy link
Member

Choose a reason for hiding this comment

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

I don't think we need to be that verbose, "Settings Gear" seems pretty clear to me?

Copy link
Contributor

Choose a reason for hiding this comment

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

How about ⚙️ ?

Copy link
Contributor

@deeplow deeplow Jul 11, 2024

Choose a reason for hiding this comment

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

Whoops. Never mind. I see that that's what's being proposed already.

Copy link
Contributor

Choose a reason for hiding this comment

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

It is unlikely to be clear to everybody - some folk will take it literally and look for a text menu item, some folk may not be clear as to which settings gear it means (another one literally labeled "Settings" is shown on the left, that applies to single VMs). Specificity is worth it in this case even if it means being a little more verbose.

Copy link
Member

Choose a reason for hiding this comment

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

Would **Q > Settings Gear (left sidebar) > Other > Xfce Terminal** be sufficient?

Copy link
Member

Choose a reason for hiding this comment

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

Kev also mentioned that when you open the Q menu, there are two settings gears, one in the left sidebar, and one on the right side, as the "Settings" for whichever AppVM is selected by default, so we do need to disambiguate them somehow.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks @zenmonkeykstop - that makes sense. I just pushed a change that should incorporate your suggestion everywhere the gear icon is mentioned. Reviewers, please make sure I didn't miss any.

@@ -76,9 +83,9 @@ Users of SecureDrop Workstation must enter their username, passphrase and two-fa

In order to set up KeePassXC for easy use:

- Add KeePassXC to the application menu by selecting it from the list of available apps in **Q > Domain: vault > vault: Qube Settings > Applications** and pressing the button labeled **>** (do not press the button labeled **>>**, which will add *all* applications to the menu).
- Add KeePassXC to the application menu by selecting it from the list of available apps in **Q > Apps > vault > Settings > Applications** and pressing the button labeled **>** (do not press the button labeled **>>**, which will add *all* applications to the menu).
Copy link
Contributor

Choose a reason for hiding this comment

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

I would vote to fix it while we're in here!

docs/admin/install/prepare.rst Outdated Show resolved Hide resolved
docs/admin/install/prepare.rst Outdated Show resolved Hide resolved
docs/admin/install/prepare.rst Outdated Show resolved Hide resolved
docs/admin/install/prepare.rst Show resolved Hide resolved
@@ -89,7 +122,7 @@ Once the initial setup is complete, the login dialog will be displayed. Log in u

If, during the installation, you encountered the grayed out option "USB qube configuration disabled", you must now create a VM to access your USB devices. If you did not encounter this issue, you can skip this section.

To create a USB qube, open a ``dom0`` terminal via the Qubes menu (the **Q** icon in the upper left corner): **Q > Terminal Emulator**. Run the following command:
To create a USB qube, open a ``dom0`` terminal via the Qubes menu (the **Q** icon in the upper left corner): **Q > Settings Gear > Other > Xfce Terminal**. Run the following command:
Copy link
Contributor

Choose a reason for hiding this comment

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

Same note re gear icon.

docs/admin/install/prepare.rst Outdated Show resolved Hide resolved
docs/admin/install/prepare.rst Outdated Show resolved Hide resolved
docs/admin/install/prepare.rst Outdated Show resolved Hide resolved
~~~~~~~~~~~~~~~~~~~~~~~~~~

See :doc:`../reference/upgrading_fedora`.
- Once Tor has connected, select **Q > Settings Gear > Qubes Tools > Qubes Update** to update the system VMs. in the ``[Dom0] Qubes Updater`` window, check all entries in the list above except for dom0 (which you have already updated in the previous step). Then, click **Next**. The system's VMs will be updated sequentially - this may take some time. When the updates are complete, click **Finish**.
Copy link
Contributor

Choose a reason for hiding this comment

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

Does it still make sense to separate dom0 updating from template updating? Might be easier to suggest: check all boxes and restart afterwards. What to you think? This is already the case for how SDW updater works. So I can't think of any reason not to do it. On top of that, that would make all of this step GUI-based.

|Unlock TailsData|

- Open a ``dom0`` terminal via **Q > Terminal Emulator**, and run the following command to list the SVS submission key details, including its fingerprint:
- Open a ``dom0`` terminal via **Q > Settings Gear > Other > Xfce Terminal**, and run the following command to list the SVS submission key details, including its fingerprint:
Copy link
Contributor

Choose a reason for hiding this comment

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

How about ⚙️ ?

@nathandyer nathandyer force-pushed the qubes-42-install-changes branch from ba30e96 to 36962ad Compare July 11, 2024 22:23
@nathandyer
Copy link
Contributor Author

Alright, I think I've addressed everyone's feedback. If I've overlooked anything, please let me know. A rough list of changes I made:

  • Removed the warning and all language about pre-release/unstable software
  • Updated Qubes references to point to 4.2.2 (not rc), with the knowledge we can fall back to 4.2.1 if need be
  • Added in the additional changes from Erik's draft PR in Qubes 4.2 download, menu and updater changes #222
  • Added a commit to remove the section about rotating legacy passphrases (we can drop the commit if we want to leave that in for now)
  • It seems there is still some debate about how to handle the "Settings gear" references. The unicode icon is not an option for this release, and I think like @legoktm I prefer the more concise option of just referring to the "Settings gear icon" within the path - but will be glad to change it to the more verbose option ("on the left sidebar"... etc.) if we prefer it.

@legoktm
Copy link
Member

legoktm commented Jul 12, 2024

I'm going to walk through this via yum-qa/apt-qa and approve if it all goes well.

Copy link
Member

@legoktm legoktm left a comment

Choose a reason for hiding this comment

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

OK, finished going through, just about everything is good, I flagged one of the "Other locations" needing to be updated for Thunar, there are a few more places if you search in the file for it.

@nathandyer nathandyer force-pushed the qubes-42-install-changes branch from 36962ad to 98db13e Compare July 12, 2024 18:46
@nathandyer
Copy link
Contributor Author

Thanks for taking the new instructions for such a thorough test drive @legoktm! Back to you.

@nathandyer nathandyer force-pushed the qubes-42-install-changes branch from 98db13e to 33ec231 Compare July 12, 2024 18:54
legoktm
legoktm previously approved these changes Jul 12, 2024
Copy link
Member

@legoktm legoktm left a comment

Choose a reason for hiding this comment

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

Awesome! :shipit:

@legoktm legoktm enabled auto-merge July 12, 2024 18:55
@legoktm legoktm requested a review from zenmonkeykstop July 12, 2024 19:32
@legoktm legoktm added this pull request to the merge queue Jul 12, 2024
Merged via the queue into main with commit 6d5161a Jul 12, 2024
4 checks passed
@legoktm legoktm deleted the qubes-42-install-changes branch July 12, 2024 20:32
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.

4 participants