Skip to content

Commit

Permalink
Merge pull request freedomofpress#4394 from freedomofpress/docs-bump-…
Browse files Browse the repository at this point in the history
…to-0.12.2

[docs] Bump SecureDrop version in docs to 0.12.2
  • Loading branch information
redshiftzero committed Apr 30, 2019
2 parents 5240e5f + 209fc1d commit e3da51c
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
# built documents.
#
# The short X.Y version.
version = '0.12.1'
version = '0.12.2'
# The full version, including alpha/beta/rc tags.
release = '0.12.1'
release = '0.12.2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
4 changes: 2 additions & 2 deletions docs/set_up_admin_tails.rst
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ key:
.. code:: sh
cd ~/Persistent/securedrop/
git checkout 0.12.1
git tag -v 0.12.1
git checkout 0.12.2
git tag -v 0.12.2
You should see ``Good signature from "SecureDrop Release Signing Key"`` in the
output of that last command along with the fingerprint above.
Expand Down
4 changes: 2 additions & 2 deletions docs/upgrade/xenial_backup_install_restore.rst
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ code is up-to-date and validated. From a terminal, run the following commands:
cd ~/Persistent/securedrop
git fetch --tags
git tag -v 0.12.1
git tag -v 0.12.2
You should see ``Good signature from "SecureDrop Release Signing Key"`` in the
output of that last command, along with the fingerprint ``"2224 5C81 E3BA EB41
Expand All @@ -177,7 +177,7 @@ First, check out the release tag that you validated above:

.. code:: sh
git checkout 0.12.1
git checkout 0.12.2
Next, run the following command to set up the SecureDrop administration environment:

Expand Down
18 changes: 9 additions & 9 deletions docs/upgrade/xenial_prep.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ release series on February 26. The operating system update itself must be
performed manually.

We recommend that you plan two working days (after your instance has been
updated to SecureDrop 0.12.1) to backup your instance, perform the upgrade, and
updated to SecureDrop 0.12.2) to backup your instance, perform the upgrade, and
test your instance once it is upgraded. We recommend scheduling this maintenance
window no earlier than March 6.

Expand Down Expand Up @@ -51,7 +51,7 @@ from the command line on the *Application Server* by running the command:
SecureDrop servers are updated automatically with the latest release version
(0.12.1). Recently, some long-running SecureDrop instances were affected by a
(0.12.2). Recently, some long-running SecureDrop instances were affected by a
bug which will cause any updates after 0.10.0 to fail. If your instance is still
running 0.10.0, please `consult our advisory <https://securedrop.org/news/advisory-automatic-update-failure-version-0100-0110-some-securedrop-instances/>`_
to update to the latest version.
Expand Down Expand Up @@ -92,7 +92,7 @@ The output from ``git status`` should include the following text:
where ``<version>`` is the version of the workstation code that is installed.

If the *Admin Workstation* is at version 0.12.1, it is up-to-date, and you can
If the *Admin Workstation* is at version 0.12.2, it is up-to-date, and you can
proceed with :ref:`making a backup of the instance <backup_instance>` and
:ref:`verifying SSH connectivity <verify_ssh_access>`. If the *Admin
Workstation* is running an earlier version, you will need to upgrade it, using
Expand All @@ -105,7 +105,7 @@ the appropriate steps for your version:
Upgrading from version 0.9.1 or later
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

If the workstation is at least at version 0.9.1 and up to version 0.12.1, you
If the workstation is at least at version 0.9.1 and up to version 0.12.2, you
should see a graphical updater informing you about the availability of a new
version. The graphical updater looks like this:

Expand Down Expand Up @@ -133,7 +133,7 @@ following commands:
cd ~/Persistent/securedrop
git fetch --tags
gpg --recv-key "2224 5C81 E3BA EB41 38B3 6061 310F 5612 00F4 AD77"
git tag -v 0.12.1
git tag -v 0.12.2
The output should include the following two lines:

Expand All @@ -147,9 +147,9 @@ the screen of your workstation. If it does, you can check out the new release:

.. code:: sh
git checkout 0.12.1
git checkout 0.12.2
.. important:: If you see the warning ``refname ‘0.12.1’ is ambiguous`` in the
.. important:: If you see the warning ``refname ‘0.12.2’ is ambiguous`` in the
output, we recommend that you contact us immediately at securedrop@freedom.press
(GPG encrypted).

Expand Down Expand Up @@ -188,7 +188,7 @@ code:
cd ~/Persistent
git clone https://github.com/freedomofpress/securedrop.git
cd ~Persistent/securedrop
git tag -v 0.12.1
git tag -v 0.12.2
.. note:: The SecureDrop application code must be installed in the
`~/Persistent/securedrop` directory in order to complete the reprovisioning
Expand All @@ -211,7 +211,7 @@ Now, check out the current release with the following command:

.. code:: sh
git checkout 0.12.1
git checkout 0.12.2
Next, mount the persistent volume of the old *Admin Workstation* in order to
retrieve instance-specific files that you’ll need to set up the new workstation.
Expand Down
10 changes: 5 additions & 5 deletions docs/upgrade/xenial_upgrade_in_place.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Before performing the upgrade, please perform all the steps outlined in
.. warning::
In order to successfully upgrade your SecureDrop instance, it is of critical
importance that your *Admin Workstation* and your servers use SecureDrop
0.12.1. Releases prior to the 0.12 series of SecureDrop do not not support
0.12.2. Releases prior to the 0.12 series of SecureDrop do not not support
Ubuntu 16.04.


Expand Down Expand Up @@ -213,7 +213,7 @@ code is up-to-date and validated. From a terminal, run the following commands:
cd ~/Persistent/securedrop
git fetch --tags
git tag -v 0.12.1
git tag -v 0.12.2
You should see ``Good signature from "SecureDrop Release Signing Key"`` in the
output of that last command, along with the fingerprint
Expand All @@ -231,7 +231,7 @@ First, check out the release tag that you validated above:

.. code:: sh
git checkout 0.12.1
git checkout 0.12.2
Next, in the terminal, run the following command to set up the SecureDrop
admin environment:
Expand Down Expand Up @@ -279,15 +279,15 @@ Server* and your *Monitor Server*.
Validate the application version
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

To confirm that you are running SecureDrop 0.12.1 for Xenial, on the Tails
To confirm that you are running SecureDrop 0.12.2 for Xenial, on the Tails
desktop, you should find a shortcut called **SecureDrop Source Interface**.
Double-click it to launch the Tor browser.

After the *Source Interface* loads, add the path ``/metadata`` to the URL in
your address bar. If your *Source Interface* can be found at
``examplenot4real.onion``, then the address you should visit is
``examplenot4real.onion/metadata``. That page should show you key/value pairs,
including ``0.12.1`` for ``sd_version`` and ``16.04`` for ``server_os``.
including ``0.12.2`` for ``sd_version`` and ``16.04`` for ``server_os``.

End-to-end test
^^^^^^^^^^^^^^^
Expand Down

0 comments on commit e3da51c

Please sign in to comment.