Skip to content

Commit

Permalink
Fine-tunes securedrop-config package dependency
Browse files Browse the repository at this point in the history
Previously tried to piggyback on securedrop-keyring, setting the
securedrop-config package as a dependency thereof. It's more explicit to
list securedrop-config as a dependency of packages required for the
Application and Monitor Server roles:

  * securedrop-app-code
  * securedrop-ossec-agent
  * securedrop-ossec-server

Therefore, removed the dependency in securedrop-keyring.
  • Loading branch information
Conor Schaefer committed Oct 3, 2017
1 parent c4159dd commit 8e8fd56
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion install_files/securedrop-app-code/DEBIAN/control
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ Homepage: https://securedrop.org
Package: securedrop-app-code
Version: 0.4.3
Architecture: amd64
Depends: python-pip,apparmor-utils,gnupg2,haveged,python,python-pip,secure-delete,sqlite,apache2-mpm-worker,libapache2-mod-wsgi,libapache2-mod-xsendfile,redis-server,supervisor,securedrop-keyring
Depends: python-pip,apparmor-utils,gnupg2,haveged,python,python-pip,secure-delete,sqlite,apache2-mpm-worker,libapache2-mod-wsgi,libapache2-mod-xsendfile,redis-server,supervisor,securedrop-keyring,securedrop-config
Description: Packages the SecureDrop application code pip dependencies and apparmor profiles. This package will put the apparmor profiles in enforce mode. This package does use pip to install the pip wheelhouse
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,securedrop-config
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 @@ -6,7 +6,7 @@ Homepage: https://securedrop.org
Package: securedrop-ossec-agent
Version: 2.8.2+0.4.3
Architecture: amd64
Depends: ossec-agent,securedrop-keyring
Depends: ossec-agent,securedrop-keyring,securedrop-config
Replaces: ossec-agent
Conflicts: securedrop-ossec-server
Description: Installs the securedrop pre-configured 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 @@ -6,7 +6,7 @@ Homepage: https://securedrop.org
Package: securedrop-ossec-server
Version: 2.8.2+0.4.3
Architecture: amd64
Depends: ossec-server,securedrop-keyring
Depends: ossec-server,securedrop-keyring,securedrop-config
Replaces: ossec-server
Conflicts: securedrop-ossec-agent
Description: Installs the pre-packaged OSSEC server
Expand Down

0 comments on commit 8e8fd56

Please sign in to comment.