From 2a746ddab422d90525a5db0c95ee4c51970714ac Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Wed, 29 May 2019 20:45:58 +0000 Subject: [PATCH] SecureDrop release 0.13.0 --- changelog.md | 2 +- docs/conf.py | 4 ++-- docs/set_up_admin_tails.rst | 4 ++-- docs/upgrade/xenial_backup_install_restore.rst | 4 ++-- docs/upgrade/xenial_prep.rst | 18 +++++++++--------- docs/upgrade/xenial_upgrade_in_place.rst | 10 +++++----- .../ansible-base/group_vars/all/securedrop | 2 +- .../files/changelog-xenial | 4 ++-- install_files/securedrop-config/DEBIAN/control | 2 +- .../securedrop-keyring/DEBIAN/control | 2 +- .../securedrop-ossec-agent/DEBIAN/control | 2 +- .../securedrop-ossec-server/DEBIAN/control | 2 +- molecule/builder-xenial/tests/vars.yml | 2 +- molecule/shared/stable.ver | 2 +- securedrop/version.py | 2 +- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/changelog.md b/changelog.md index 783b201544..182e1715f1 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # Changelog -## 0.13.0~rc1 +## 0.13.0 ### Web Application diff --git a/docs/conf.py b/docs/conf.py index 45a312283b..c9fb758a14 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,9 +57,9 @@ # built documents. # # The short X.Y version. -version = '0.12.2' +version = '0.13.0' # The full version, including alpha/beta/rc tags. -release = '0.12.2' +release = '0.13.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/set_up_admin_tails.rst b/docs/set_up_admin_tails.rst index 0e0791f929..a2b25cd477 100644 --- a/docs/set_up_admin_tails.rst +++ b/docs/set_up_admin_tails.rst @@ -114,8 +114,8 @@ key: .. code:: sh cd ~/Persistent/securedrop/ - git checkout 0.12.2 - git tag -v 0.12.2 + git checkout 0.13.0 + git tag -v 0.13.0 You should see ``Good signature from "SecureDrop Release Signing Key"`` in the output of that last command along with the fingerprint above. diff --git a/docs/upgrade/xenial_backup_install_restore.rst b/docs/upgrade/xenial_backup_install_restore.rst index 56e5f78abb..bd822cd2b8 100644 --- a/docs/upgrade/xenial_backup_install_restore.rst +++ b/docs/upgrade/xenial_backup_install_restore.rst @@ -161,7 +161,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.2 + git tag -v 0.13.0 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 @@ -179,7 +179,7 @@ First, check out the release tag that you validated above: .. code:: sh - git checkout 0.12.2 + git checkout 0.13.0 Next, run the following command to set up the SecureDrop administration environment: diff --git a/docs/upgrade/xenial_prep.rst b/docs/upgrade/xenial_prep.rst index c5f7733a6a..5d4517b395 100644 --- a/docs/upgrade/xenial_prep.rst +++ b/docs/upgrade/xenial_prep.rst @@ -15,7 +15,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.2) to backup your instance, perform the upgrade, and +updated to SecureDrop 0.13.0) 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. @@ -53,7 +53,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.2). Recently, some long-running SecureDrop instances were affected by a +(0.13.0). 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 `_ to update to the latest version. @@ -94,7 +94,7 @@ The output from ``git status`` should include the following text: where ```` is the version of the workstation code that is installed. -If the *Admin Workstation* is at version 0.12.2, it is up-to-date, and you can +If the *Admin Workstation* is at version 0.13.0, it is up-to-date, and you can proceed with :ref:`making a backup of the instance ` and :ref:`verifying SSH connectivity `. If the *Admin Workstation* is running an earlier version, you will need to upgrade it, using @@ -107,7 +107,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.2, you +If the workstation is at least at version 0.9.1 and up to version 0.13.0, you should see a graphical updater informing you about the availability of a new version. The graphical updater looks like this: @@ -135,7 +135,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.2 + git tag -v 0.13.0 The output should include the following two lines: @@ -149,9 +149,9 @@ the screen of your workstation. If it does, you can check out the new release: .. code:: sh - git checkout 0.12.2 + git checkout 0.13.0 -.. important:: If you see the warning ``refname ‘0.12.2’ is ambiguous`` in the +.. important:: If you see the warning ``refname ‘0.13.0’ is ambiguous`` in the output, we recommend that you contact us immediately at securedrop@freedom.press (GPG encrypted). @@ -190,7 +190,7 @@ code: cd ~/Persistent git clone https://github.com/freedomofpress/securedrop.git cd ~Persistent/securedrop - git tag -v 0.12.2 + git tag -v 0.13.0 .. note:: The SecureDrop application code must be installed in the `~/Persistent/securedrop` directory in order to complete the reprovisioning @@ -213,7 +213,7 @@ Now, check out the current release with the following command: .. code:: sh - git checkout 0.12.2 + git checkout 0.13.0 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. diff --git a/docs/upgrade/xenial_upgrade_in_place.rst b/docs/upgrade/xenial_upgrade_in_place.rst index 34abd42c7d..65c3af06ff 100644 --- a/docs/upgrade/xenial_upgrade_in_place.rst +++ b/docs/upgrade/xenial_upgrade_in_place.rst @@ -32,7 +32,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.2. Releases prior to the 0.12 series of SecureDrop do not not support + 0.13.0. Releases prior to the 0.12 series of SecureDrop do not not support Ubuntu 16.04. @@ -215,7 +215,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.2 + git tag -v 0.13.0 You should see ``Good signature from "SecureDrop Release Signing Key"`` in the output of that last command, along with the fingerprint @@ -233,7 +233,7 @@ First, check out the release tag that you validated above: .. code:: sh - git checkout 0.12.2 + git checkout 0.13.0 Next, in the terminal, run the following command to set up the SecureDrop admin environment: @@ -281,7 +281,7 @@ Server* and your *Monitor Server*. Validate the application version ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -To confirm that you are running SecureDrop 0.12.2 for Xenial, on the Tails +To confirm that you are running SecureDrop 0.13.0 for Xenial, on the Tails desktop, you should find a shortcut called **SecureDrop Source Interface**. Double-click it to launch the Tor browser. @@ -289,7 +289,7 @@ 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.2`` for ``sd_version`` and ``16.04`` for ``server_os``. +including ``0.13.0`` for ``sd_version`` and ``16.04`` for ``server_os``. End-to-end test ^^^^^^^^^^^^^^^ diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index 9498d610b8..5dfd81bf78 100644 --- a/install_files/ansible-base/group_vars/all/securedrop +++ b/install_files/ansible-base/group_vars/all/securedrop @@ -2,7 +2,7 @@ # Variables that apply to both the app and monitor server go in this file # If the monitor or app server need different values define the variable in # hosts_vars/app.yml or host_vars/mon.yml -securedrop_app_code_version: "0.13.0~rc1" +securedrop_app_code_version: "0.13.0" grsecurity: true install_local_packages: false diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial index 157942345a..282a75a506 100644 --- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial +++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial @@ -1,8 +1,8 @@ -securedrop-app-code (0.13.0~rc1+xenial) xenial; urgency=medium +securedrop-app-code (0.13.0+xenial) xenial; urgency=medium * See changelog.md - -- SecureDrop Team Fri, 17 May 2019 14:17:34 +0000 + -- SecureDrop Team Wed, 29 May 2019 20:45:21 +0000 securedrop-app-code (0.12.2+xenial) xenial; urgency=medium diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index a46e87002c..d15a47f7f3 100644 --- a/install_files/securedrop-config/DEBIAN/control +++ b/install_files/securedrop-config/DEBIAN/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: SecureDrop Team Homepage: https://securedrop.org Package: securedrop-config -Version: 0.1.3+0.13.0~rc1 +Version: 0.1.3+0.13.0 Architecture: all Description: Establishes baseline system state for running SecureDrop. Configures apt repositories. diff --git a/install_files/securedrop-keyring/DEBIAN/control b/install_files/securedrop-keyring/DEBIAN/control index e2d564da50..316041b74e 100644 --- a/install_files/securedrop-keyring/DEBIAN/control +++ b/install_files/securedrop-keyring/DEBIAN/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: SecureDrop Team Homepage: https://securedrop.org Package: securedrop-keyring -Version: 0.1.2+0.13.0~rc1 +Version: 0.1.2+0.13.0 Architecture: amd64 Depends: gnupg Description: Provides an apt keyring for SecureDrop-related packages, so the master signing key used for SecureDrop packages can be updated via apt. diff --git a/install_files/securedrop-ossec-agent/DEBIAN/control b/install_files/securedrop-ossec-agent/DEBIAN/control index c9b0e3cad2..40f215e426 100644 --- a/install_files/securedrop-ossec-agent/DEBIAN/control +++ b/install_files/securedrop-ossec-agent/DEBIAN/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: SecureDrop Team Homepage: https://securedrop.org Package: securedrop-ossec-agent -Version: 3.0.0+0.13.0~rc1 +Version: 3.0.0+0.13.0 Architecture: amd64 Depends: ossec-agent,securedrop-keyring,securedrop-config Replaces: ossec-agent diff --git a/install_files/securedrop-ossec-server/DEBIAN/control b/install_files/securedrop-ossec-server/DEBIAN/control index 92823f7f05..ab19648aaf 100644 --- a/install_files/securedrop-ossec-server/DEBIAN/control +++ b/install_files/securedrop-ossec-server/DEBIAN/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: SecureDrop Team Homepage: https://securedrop.org Package: securedrop-ossec-server -Version: 3.0.0+0.13.0~rc1 +Version: 3.0.0+0.13.0 Architecture: amd64 Depends: ossec-server,securedrop-keyring,securedrop-config Replaces: ossec-server diff --git a/molecule/builder-xenial/tests/vars.yml b/molecule/builder-xenial/tests/vars.yml index cef8a78412..efbec6a41e 100644 --- a/molecule/builder-xenial/tests/vars.yml +++ b/molecule/builder-xenial/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "0.13.0~rc1" +securedrop_version: "0.13.0" ossec_version: "3.0.0" keyring_version: "0.1.2" config_version: "0.1.3" diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver index 26acbf080b..54d1a4f2a4 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -0.12.2 +0.13.0 diff --git a/securedrop/version.py b/securedrop/version.py index f7c0bd53e3..2d7893e3de 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '0.13.0~rc1' +__version__ = '0.13.0'