From b8f5454173bbf57a8cf220fe2b35c61484cfb496 Mon Sep 17 00:00:00 2001 From: Erik Moeller Date: Mon, 18 May 2020 09:37:37 -0700 Subject: [PATCH 1/3] Cleanup commit: whitespace --- docs/development/qubes_staging.rst | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/development/qubes_staging.rst b/docs/development/qubes_staging.rst index 9ea59b08d4..11af560da4 100644 --- a/docs/development/qubes_staging.rst +++ b/docs/development/qubes_staging.rst @@ -299,9 +299,9 @@ environment. In from the root of the SecureDrop project in ``sd-dev``, run: make staging -The ``make staging`` command invokes the ``qubes-staging`` Molecule scenario. +The ``make staging`` command invokes the ``qubes-staging`` Molecule scenario. You can also run constituent Molecule actions directly, rather than using -the Makefile target: +the Makefile target: .. code:: sh @@ -309,11 +309,11 @@ the Makefile target: molecule converge -s qubes-staging molecule test -s qubes-staging -.. note:: +.. note:: - If the Molecule converge scenario fails with an error like ``"stderr": - "app: Failed to clone appmenus, qvm-appmenus missing\`` you may be running - into a bug in Qubes that prevents non-dom0 VMs from cloning new VMs. A + If the Molecule converge scenario fails with an error like ``"stderr": + "app: Failed to clone appmenus, qvm-appmenus missing\`` you may be running + into a bug in Qubes that prevents non-dom0 VMs from cloning new VMs. A workaround is described `here `_. That's it. You should now have a running, configured SecureDrop staging instance @@ -324,4 +324,3 @@ to provision staging VMs on-demand. To remove the staging instance, use the Mole .. code:: sh molecule destroy -s qubes-staging - From bf9a3fa5759087b835a763cdd43419dd528d8dd3 Mon Sep 17 00:00:00 2001 From: Erik Moeller Date: Mon, 18 May 2020 09:44:08 -0700 Subject: [PATCH 2/3] Update Qubes references to debian-10, add tip for aufs-dkms --- docs/development/qubes_staging.rst | 2 +- docs/development/setup_development.rst | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/development/qubes_staging.rst b/docs/development/qubes_staging.rst index 11af560da4..2ae4b742a2 100644 --- a/docs/development/qubes_staging.rst +++ b/docs/development/qubes_staging.rst @@ -15,7 +15,7 @@ Standalone (HVM) Qubes VMs for use with staging: - ``sd-staging-app-base``, a base VM for the *SecureDrop Application Server* - ``sd-staging-mon-base``, a base VM for the *SecureDrop Monitor Server* -While the development VM, ``sd-dev``, is based on Debian 9, the other VMs +While the development VM, ``sd-dev``, is based on Debian 10, the other VMs will be based on Ubuntu Xenial. .. note:: The staging server VM names were recently changed from ``sd-app`` and diff --git a/docs/development/setup_development.rst b/docs/development/setup_development.rst index 513047e6c0..f939ad0579 100644 --- a/docs/development/setup_development.rst +++ b/docs/development/setup_development.rst @@ -52,13 +52,13 @@ Install Docker_. Qubes ~~~~~ -Create a StandaloneVM based on Debian 9, called ``sd-dev``. +Create a StandaloneVM based on Debian 10, called ``sd-dev``. You can use the **Q** menu to configure a new VM, or run the following in ``dom0``: .. code:: sh - qvm-clone --class StandaloneVM debian-9 sd-dev + qvm-clone --class StandaloneVM debian-10 sd-dev qvm-start sd-dev qvm-sync-appmenus sd-dev @@ -66,6 +66,10 @@ The commands above will created a new StandaloneVM, boot it, then update the Qubes menus with applications within that VM. Open a terminal in ``sd-dev``, and proceed with installing `Docker CE for Debian`_. +.. tip:: If you experience an error with the ``aufs-dkms`` dependency when + installing Docker CE, you can safely skip that package using the + ``--no-install-recommends`` argument for ``apt``. + Fork & Clone the Repository ~~~~~~~~~~~~~~~~~~~~~~~~~~~ From d731795307396f7b76ea45fafae72f84503b6d90 Mon Sep 17 00:00:00 2001 From: Conor Schaefer Date: Mon, 18 May 2020 10:00:54 -0700 Subject: [PATCH 3/3] Dev docs: Debian 9 -> Debian "stable" We'll continue to track the stable series of Debian (currently 10, Buster) for developer docs, so use the "stable" label. --- docs/development/virtual_environments.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/development/virtual_environments.rst b/docs/development/virtual_environments.rst index f07d8bc76e..93dfe55fee 100644 --- a/docs/development/virtual_environments.rst +++ b/docs/development/virtual_environments.rst @@ -224,8 +224,8 @@ Log out, then log in again. Verify that libvirt is installed and KVM is availabl kvm-ok -Debian 9 setup -^^^^^^^^^^^^^^ +Debian stable setup +^^^^^^^^^^^^^^^^^^^ Install Vagrant, libvirt, QEMU, and their dependencies: