Skip to content

Commit

Permalink
Incorproate review feedback, line formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
rocodes committed Nov 25, 2019
1 parent 0715fe9 commit 1c7e181
Show file tree
Hide file tree
Showing 4 changed files with 106 additions and 84 deletions.
25 changes: 13 additions & 12 deletions docs/admin.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ The admin should keep all SecureDrop workstations updated with
* **SecureDrop workstation updates** for each *Admin Workstation* and
*Journalist Workstation*.

You should apply Tails updates to your Tails drives as they are released, as they
often contain critical security fixes. Subscribe to the `Tails RSS Feed`_ to be
alerted of new releases. The online Tails drives, once booted and connected to Tor,
will alert you if upgrades are available. Follow the `Tails Upgrade Documentation`_
on how to upgrade the drives.
You should apply Tails updates to your Tails drives as they are released, as
they often contain critical security fixes. Subscribe to the `Tails RSS Feed`_
to be alerted of new releases. The online Tails drives, once booted and
connected to Tor, will alert you if upgrades are available. Follow the `Tails
Upgrade Documentation`_ on how to upgrade the drives.

.. include:: includes/update-gui.txt

Expand All @@ -82,18 +82,18 @@ on how to upgrade the drives.
Monitoring OSSEC Alerts for Unusual Activity
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

The admin should decrypt and read all OSSEC alerts. Report any suspicious events to
FPF through the `SecureDrop Support Portal`_. See the :doc:`OSSEC Guide <ossec_alerts>`
for more information on common OSSEC alerts.
The admin should decrypt and read all OSSEC alerts. Report any suspicious
events to FPF through the `SecureDrop Support Portal`_. See the :doc:`OSSEC
Guide <ossec_alerts>` for more information on common OSSEC alerts.

.. warning:: Do not post logs or alerts to public forums without first carefully
examining and redacting any sensitive information.

.. _test OSSEC alert:

.. note:: You can send a test OSSEC alert to verify OSSEC and your email configuration
is working properly through the *Admin Interface* by clicking **Send
Test OSSEC Alert**:
.. note:: You can send a test OSSEC alert to verify OSSEC and your email
configuration is working properly through the *Admin Interface* by
clicking **Send Test OSSEC Alert**:

|Test Alert|

Expand Down Expand Up @@ -178,7 +178,8 @@ information, read the :doc:`YubiKey Setup Guide <yubikey_setup>`.
|Enable YubiKey|

Once you've configured the YubiKey and entered the Secret Key, click
*Add user*. On the next page, have the journalist enter a code from their YubiKey by inserting it into the workstation and pressing the button.
*Add user*. On the next page, have the journalist enter a code from their
YubiKey by inserting it into the workstation and pressing the button.

|Verify YubiKey|

Expand Down
24 changes: 13 additions & 11 deletions docs/backup_workstations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ hub which may reduce transfer speeds.
Preparing the Backup Device
~~~~~~~~~~~~~~~~~~~~~~~~~~~

First you must boot the *primary Tails USB* drive. Ensure you set an administrator
password set at the login screen. Then navigate to **Applications** ▸ **Utilities** ▸ **Disks**.
First you must boot the *primary Tails USB* drive. Ensure you set an
administrator password set at the login screen. Then navigate to
**Applications** ▸ **Utilities** ▸ **Disks**.

|Applications Utilities Disks|

Expand All @@ -69,7 +70,8 @@ Fill out the form as follows:
|Format Backup Drive|

* **Erase**: `Don't overwrite existing data (Quick)`
* **Type**: `Internal disk for use with other Linux systems only (Ext4)`, and make sure `Password protect volume (LUKS)` is checked
* **Type**: `Internal disk for use with other Linux systems only (Ext4)`, and
make sure `Password protect volume (LUKS)` is checked
* **Name**: `Backup`

|Backup Drive Passphrase|
Expand Down Expand Up @@ -180,17 +182,17 @@ the Backup USB. Click its entry in the lefthand column and enter its decryption
passphrase when prompted. Its volume name (``Backup`` in the instructions above)
will appear in place of the generic ``N.M GB Encrypted`` name.

Next, insert the new workstation USB, and click its entry in the lefhand column. When
prompted, enter its persistent volume's passphrase. The volume name ``TailsData``
will appear in the lefthand column.
Next, insert the new workstation USB, and click its entry in the lefthand
column. When prompted, enter its persistent volume's passphrase. The volume
name ``TailsData`` will appear in the lefthand column.

Copy the Backup to the New Workstation USB's Persistent Volume
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Open a terminal by navigating to **Applications** ▸ **Favorites**
▸ **Terminal** . Next, use the ``rsync`` command to copy the appropriate backup
folder to the new workstation USB's persistent volume. For example, if the backup
folder to be copied is named ``admin-backup``, run the following command:
folder to the new workstation USB's persistent volume. For example, if the
backup folder to be copied is named ``admin-backup``, run the following command:

.. code:: sh
Expand All @@ -201,9 +203,9 @@ folder to be copied is named ``admin-backup``, run the following command:
paths in the command above, otherwise the backup files will not
be restored correctly.

Once the command is complete, click the Eject button for the ``TailsData`` volume
in the lefthand column of the file manager, wait for the ``TailsData`` entry to
disappear from the column, and remove the new workstation USB.
Once the command is complete, click the Eject button for the ``TailsData``
volume in the lefthand column of the file manager, wait for the ``TailsData``
entry to disappear from the column, and remove the new workstation USB.

You may now repeat the restore process for any other USBs that you wish to
restore, or shut down the host Tails USB and test your new workstation USB by
Expand Down
Loading

0 comments on commit 1c7e181

Please sign in to comment.