Skip to content

Commit

Permalink
Remove old apt key from Ansible logic
Browse files Browse the repository at this point in the history
Follow-up to #5979. Removes the old, i.e.
22245C81E3BAEB4138B36061310F561200F4AD77, apt key from the Ansible
install-time logic. The key has been expired since 2021-06-30.
  • Loading branch information
Conor Schaefer committed Oct 12, 2021
1 parent 81576f6 commit 8780cae
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
6 changes: 3 additions & 3 deletions install_files/ansible-base/group_vars/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ daily_reboot_time: 4 # An integer between 0 and 23
# Apt-test repo is needed for testing new kernels in staging.
apt_repo_url: "https://apt-test.freedom.press"

# As of 0.7.0, we use separate repos for SecureDrop and Tor mirrors,
# only one of which typically has a test/QA server configured.
# As of v2.1.0, we ship only the 2021 version of the prod signing key.
# For staging, we also include the apt-test.freedom.press repo key.
apt_repo_pubkey_files:
- apt-test-signing-key.pub
- fpf-signing-key.pub
- fpf-signing-key-2021.pub
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ install_local_packages: False
# May be overridden in staging to install from a test/QA server,
# the Release file for which will *not* be signed with the prod key.
apt_repo_pubkey_files:
- fpf-signing-key.pub
- fpf-signing-key-2021.pub

# As of v2.0.0, only Focal is supported.
Expand Down

0 comments on commit 8780cae

Please sign in to comment.