Skip to content

Commit

Permalink
SecureDrop 1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
zenmonkeykstop committed Dec 3, 2019
1 parent 0c0104b commit 92f1dc6
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## 1.2.0~rc2
## 1.2.0

### Web Applications

Expand Down
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 = '1.1.0'
version = '1.2.0'
# The full version, including alpha/beta/rc tags.
release = '1.1.0'
release = '1.2.0'

# 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 @@ -131,8 +131,8 @@ signed with the release signing key:
.. code:: sh
cd ~/Persistent/securedrop/
git checkout 1.1.0
git tag -v 1.1.0
git checkout 1.2.0
git tag -v 1.2.0
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 install_files/ansible-base/group_vars/all/securedrop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# 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: "1.2.0~rc2"
securedrop_app_code_sdist_version: "securedrop-app-code-1.2.0-rc2"
securedrop_app_code_version: "1.2.0"
securedrop_app_code_sdist_version: "securedrop-app-code-1.2.0"
securedrop_app_code_sdist_name: "{{ securedrop_app_code_sdist_version }}.tar.gz"

grsecurity: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
securedrop-app-code (1.2.0~rc2+xenial) xenial; urgency=medium
securedrop-app-code (1.2.0+xenial) xenial; urgency=medium

* See changelog.md

Expand Down
2 changes: 1 addition & 1 deletion install_files/securedrop-config/DEBIAN/control
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Priority: optional
Maintainer: SecureDrop Team <[email protected]>
Homepage: https://securedrop.org
Package: securedrop-config
Version: 0.1.3+1.2.0~rc2
Version: 0.1.3+1.2.0
Architecture: all
Description: Establishes baseline system state for running SecureDrop.
Configures apt repositories.
2 changes: 1 addition & 1 deletion install_files/securedrop-keyring/DEBIAN/control
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Priority: optional
Maintainer: SecureDrop Team <[email protected]>
Homepage: https://securedrop.org
Package: securedrop-keyring
Version: 0.1.3+1.2.0~rc2
Version: 0.1.3+1.2.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.
2 changes: 1 addition & 1 deletion install_files/securedrop-ossec-agent/DEBIAN/control
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Priority: optional
Maintainer: SecureDrop Team <[email protected]>
Homepage: https://securedrop.org
Package: securedrop-ossec-agent
Version: 3.0.0+1.2.0~rc2
Version: 3.0.0+1.2.0
Architecture: amd64
Depends: ossec-agent,securedrop-keyring,securedrop-config
Replaces: ossec-agent
Expand Down
2 changes: 1 addition & 1 deletion install_files/securedrop-ossec-server/DEBIAN/control
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Priority: optional
Maintainer: SecureDrop Team <[email protected]>
Homepage: https://securedrop.org
Package: securedrop-ossec-server
Version: 3.0.0+1.2.0~rc2
Version: 3.0.0+1.2.0
Architecture: amd64
Depends: ossec-server,securedrop-keyring,securedrop-config
Replaces: ossec-server
Expand Down
2 changes: 1 addition & 1 deletion molecule/builder-xenial/tests/vars.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
securedrop_version: "1.2.0~rc2"
securedrop_version: "1.2.0"
ossec_version: "3.0.0"
keyring_version: "0.1.3"
config_version: "0.1.3"
Expand Down
2 changes: 1 addition & 1 deletion molecule/shared/stable.ver
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.0
1.2.0
2 changes: 1 addition & 1 deletion securedrop/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.2.0~rc2'
__version__ = '1.2.0'
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

setuptools.setup(
name="securedrop-app-code",
version="1.2.0~rc2",
version="1.2.0",
author="Freedom of the Press Foundation",
author_email="[email protected]",
description="SecureDrop Server",
Expand Down

0 comments on commit 92f1dc6

Please sign in to comment.