From 6afa1d68f159c8a7d723d563a940a43112b90cae Mon Sep 17 00:00:00 2001 From: Erik Moeller Date: Fri, 25 Jan 2019 10:30:38 -0800 Subject: [PATCH 1/2] [docs] Remove BRIX from hardware recommendations; link from checklist Part of #3826 Resolves #3197 --- docs/checklists/pre_install_hardware.rst | 7 ++++-- docs/hardware.rst | 28 +----------------------- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/docs/checklists/pre_install_hardware.rst b/docs/checklists/pre_install_hardware.rst index 692014a389..eb1648895d 100644 --- a/docs/checklists/pre_install_hardware.rst +++ b/docs/checklists/pre_install_hardware.rst @@ -5,5 +5,8 @@ This is the *minimum* hardware that must be acquired to install SecureDrop: .. include:: ../includes/pre-install-hardware.txt -.. note:: For additional details, please read the full document on - :ref:`Hardware Recommendations` for SecureDrop. +.. important:: To avoid hardware compatibility issues, we strongly recommend + adhering to our + :ref:`specific hardware recommendations `. + Please review the :ref:`Hardware ` section in full for further + details. diff --git a/docs/hardware.rst b/docs/hardware.rst index 76425aa3ee..84dcae1815 100644 --- a/docs/hardware.rst +++ b/docs/hardware.rst @@ -272,39 +272,13 @@ Specific Hardware Recommendations Application and Monitor Servers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -We currently recommend the Gigabyte BRIX, Intel NUC, or Mac Mini for -SecureDrop servers. +We currently recommend the Intel NUC or Mac Mini for SecureDrop servers. .. note:: If using non-recommended hardware, ensure you remove as much extraneous hardware as physically possible from your servers. This could include: speakers, cameras, microphones, fingerprint readers, wireless, and Bluetooth cards. -Gigabyte BRIX -~~~~~~~~~~~~~ - -The Gigabyte BRIX series is an inexpensive, quiet, low-power device that -can be used for SecureDrop servers. There are a -`variety of models `__ to choose -from; we recommend the GB-BXi5-5575. It has a mid-range CPU (the 5th -generation Intel i5), a full-size HDMI port for a monitor, and four USB 2 ports. -If you select a different model series (such as the GB-BSi5H) carefully -verify that it uses the 5th generation Intel i5. Newer generation CPUs will -**not** work with SecureDrop. - -The GB-BXi5-5575 supports wireless and Bluetooth through a removable card. This -removable card is preferable, since you want neither WiFi nor Bluetooth. You -can open the BRIX by removing the screws from the underside of the computer; the -wireless card has one small screw you need to remove and two small connectors. - -The BRIXs come as kits, and some assembly is required. You will need to purchase -the RAM and hard drive separately for each BRIX and insert both into the machine -before it can be used. We recommend: - -- 2x 240 GB SSDs (2.5") -- 1x memory kit of 2x4GB sticks (DIMM DDR3 1866MHz) - - You can put one 4GB memory stick in each of the servers. - Intel NUC ~~~~~~~~~ From 606199bdd11deef4f7ed00ba69760f7245a64b9f Mon Sep 17 00:00:00 2001 From: Erik Moeller Date: Mon, 28 Jan 2019 11:08:52 -0800 Subject: [PATCH 2/2] No longer recommend Mac Mini, but keep instructions --- docs/hardware.rst | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/docs/hardware.rst b/docs/hardware.rst index 84dcae1815..8c714bbdb0 100644 --- a/docs/hardware.rst +++ b/docs/hardware.rst @@ -272,7 +272,7 @@ Specific Hardware Recommendations Application and Monitor Servers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -We currently recommend the Intel NUC or Mac Mini for SecureDrop servers. +We currently recommend the Intel NUC for SecureDrop servers. .. note:: If using non-recommended hardware, ensure you remove as much extraneous hardware as physically possible from your servers. This @@ -326,12 +326,16 @@ for more information on how to safely configure and use more recent NUCs. Mac Minis ~~~~~~~~~ -Other than the NUCs we also recommend the 2014 Apple Mac Minis (part number MGEM2) -for installing SecureDrop. Mac Minis have removable wireless cards that you -should remove. This requires a screwdriver for non-standard -`TR6 Torx security screws `__. +.. caution:: We have previously recommended the 2014 Apple Mac Minis (part + number MGEM2) for installing SecureDrop. The 2018 Apple Mac Mini (part number + MRTR2 or MRTT2) is not a viable candidate for installing SecureDrop, due to + hardware support issues. The instructions below apply if you want to + (re-)install SecureDrop on the 2014 version. + -.. caution:: The 2018 Apple Mac Mini (part number MRTR2 or MRTT2) is not a viable candidate for installing SecureDrop, due to hardware support issues. +The 2014 Apple Mac Minis have removable wireless cards that you should remove. +This requires a screwdriver for non-standard +`TR6 Torx security screws `__. However, on the first install of Ubuntu Server the Mac Minis will not boot: this is a known and