DNM: Switch to install via apt-test

freedomofpress · Oct 25, 2024 · 65208c8 · 65208c8
1 parent acc93b2
commit 65208c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/install_files/ansible-base/roles/install-fpf-repo/defaults/main.yml b/install_files/ansible-base/roles/install-fpf-repo/defaults/main.yml
@@ -10,7 +10,7 @@
 #
 # For testing/QA, set this URL to another apt server. You must also update
 # the associated public key for the apt repo for testing/QA.
-apt_repo_url: https://apt.freedom.press
+apt_repo_url: https://apt-test.freedom.press
 
 # By default, install packages from the apt-repo, but under
 # staging hosts we'll prefer locally-built deb packages
@@ -21,6 +21,7 @@ install_local_packages: False
 # the Release file for which will *not* be signed with the prod key.
 apt_repo_pubkey_files:
   - fpf-signing-key-2021.pub
+  - apt-test-signing-key.pub
 
 # As of v2.0.0, only Focal is supported.
 apt_repo_target_distro: "{{ ansible_distribution_release }}"
diff --git a/install_files/ansible-base/roles/install-fpf-repo/tasks/main.yml b/install_files/ansible-base/roles/install-fpf-repo/tasks/main.yml
@@ -3,7 +3,7 @@
   apt_key:
     state: present
     data: "{{ lookup('file', item) }}"
-    keyring: /etc/apt/trusted.gpg.d/securedrop-keyring.gpg
+    keyring: /etc/apt/trusted.gpg.d/securedrop-keyring2.gpg
   with_items: "{{ apt_repo_pubkey_files }}"
   tags:
     - apt