Skip to content

Commit

Permalink
Builds securedrop-config package along with other debs
Browse files Browse the repository at this point in the history
Reusing the generic-pkg role to build the new `securedrop-config`
package along with the others.

Sets securedrop-config as dependency of securedrop-keyring

Adds local pkg vars for securedrop-keyring. Since `securedrop-keyring`
depends on `securedrop-config`, the latter must be installed first, so
the order of items the local packages list var is important.
  • Loading branch information
Conor Schaefer committed Sep 28, 2017
1 parent d043f54 commit 6007640
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 1 deletion.
4 changes: 4 additions & 0 deletions install_files/ansible-base/build-deb-pkgs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,8 @@
- role: build-generic-pkg
tags: "securedrop-keyring"
package_name: "securedrop-keyring"

- role: build-generic-pkg
tags: "securedrop-config"
package_name: "securedrop-config"
tags: rebuild
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ local_deb_packages:
- "securedrop-ossec-agent-2.8.2+{{ securedrop_app_code_version }}-amd64.deb"
- "{{ securedrop_app_code_deb }}.deb"
- "ossec-agent-2.8.2-amd64.deb"
- "securedrop-config-0.1.0+{{ securedrop_app_code_version }}-amd64.deb"
- "securedrop-keyring-0.1.0+{{ securedrop_app_code_version }}-amd64.deb"

# Configuring the tor hidden services
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ ip_info:
local_deb_packages:
- "securedrop-ossec-server-2.8.2+{{ securedrop_app_code_version }}-amd64.deb"
- ossec-server-2.8.2-amd64.deb
- "securedrop-config-0.1.0+{{ securedrop_app_code_version }}-amd64.deb"
- "securedrop-keyring-0.1.0+{{ securedrop_app_code_version }}-amd64.deb"

# Configure the tor hidden services. The Monitor server has only one,
Expand Down
2 changes: 1 addition & 1 deletion install_files/securedrop-keyring/DEBIAN/control
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ Homepage: https://securedrop.org
Package: securedrop-keyring
Version: 0.1.0+0.4.3
Architecture: amd64
Depends: gnupg
Depends: gnupg,securedrop-config
Description: Provides an apt keyring for SecureDrop-related packages, so the master signing key used for SecureDrop packages can be updated via apt.

0 comments on commit 6007640

Please sign in to comment.