From ffa1bb188cabeac646f13e72575dfe0d104b1865 Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Thu, 8 Jul 2021 13:32:42 -0400 Subject: [PATCH] SecureDrop 2.0.1 --- changelog.md | 2 +- install_files/ansible-base/group_vars/all/securedrop | 2 +- .../build-securedrop-app-code-deb-pkg/files/changelog-focal | 6 ++++++ molecule/builder-focal/tests/vars.yml | 2 +- molecule/shared/stable.ver | 2 +- securedrop/version.py | 2 +- setup.py | 2 +- 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/changelog.md b/changelog.md index 23e42161fe..76c4d46465 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # Changelog -## 2.0.1~rc1 +## 2.0.1 ### Operations diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index 298cdf8c56..92f5a4181b 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_version: "2.0.1~rc1" +securedrop_version: "2.0.1" securedrop_app_code_sdist_name: "securedrop-app-code-{{ securedrop_version | replace('~', '-') }}.tar.gz" grsecurity: true diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal index cd36a1c0ce..eeed319b79 100644 --- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal +++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal @@ -1,3 +1,9 @@ +securedrop-app-code (2.0.1+focal) focal; urgency=medium + + * see changelog.md + + -- SecureDrop Team Thu, 08 Jul 2021 13:32:06 -0400 + securedrop-app-code (2.0.1~rc1+focal) focal; urgency=medium * see changelog.md diff --git a/molecule/builder-focal/tests/vars.yml b/molecule/builder-focal/tests/vars.yml index 00c1d1d924..4a033bed2d 100644 --- a/molecule/builder-focal/tests/vars.yml +++ b/molecule/builder-focal/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "2.0.1~rc1" +securedrop_version: "2.0.1" ossec_version: "3.6.0" keyring_version: "0.1.5" config_version: "0.1.4" diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver index 227cea2156..38f77a65b3 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -2.0.0 +2.0.1 diff --git a/securedrop/version.py b/securedrop/version.py index 76fde6a0bc..3f3907994a 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '2.0.1~rc1' +__version__ = '2.0.1' diff --git a/setup.py b/setup.py index 02b7f43289..b1d406e4fb 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="2.0.1~rc1", + version="2.0.1", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server",