Update Grafana repository to use explicit keyring

python-discord · Jun 7, 2024 · 61e604d · 61e604d
1 parent 2854936
commit 61e604d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ansible/roles/alloy/defaults/main.yml b/ansible/roles/alloy/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 alloy_grafana_signing_key: "https://apt.grafana.com/gpg.key"
 alloy_grafana_signing_key_fingerprint: "B53AE77BADB630A683046005963FA27710458545"
-alloy_grafana_repository: "deb https://apt.grafana.com stable main"
+alloy_grafana_repository: "https://apt.grafana.com stable main"
 
 alloy_extra_files: []
diff --git a/ansible/roles/alloy/tasks/main.yml b/ansible/roles/alloy/tasks/main.yml
@@ -5,13 +5,13 @@
     url: "{{ alloy_grafana_signing_key }}"
     state: present
     id: "{{ alloy_grafana_signing_key_fingerprint }}"
-    keyring: "/etc/apt/trusted.gpg.d/grafana.gpg"
+    keyring: "/etc/apt/keyrings/grafana.gpg"
   tags:
     - role::alloy
 
 - name: Add Grafana apt repository to apt lists
   ansible.builtin.apt_repository:
-    repo: "{{ alloy_grafana_repository }}"
+    repo: "deb [signed-by=/etc/apt/keyrings/grafana.gpg] {{ alloy_grafana_repository }}"
     filename: grafana
     state: present
   tags: