Convert Alloy repository to Deb 822 format

Author: jb3

ansible/roles/alloy/defaults/main.yml

@@ -1,6 +1,5 @@
 ---
 alloy_grafana_signing_key: "https://apt.grafana.com/gpg.key"
-alloy_grafana_signing_key_fingerprint: "B53AE77BADB630A683046005963FA27710458545"
-alloy_grafana_repository: "https://apt.grafana.com stable main"
+alloy_grafana_repository: "https://apt.grafana.com"
 
 alloy_extra_files: []

ansible/roles/alloy/tasks/main.yml

@@ -1,19 +1,14 @@
 ---
 
-- name: Add apt signing key for Grafana repo
-  ansible.builtin.apt_key:
-    url: "{{ alloy_grafana_signing_key }}"
-    state: present
-    id: "{{ alloy_grafana_signing_key_fingerprint }}"
-    keyring: "/etc/apt/keyrings/grafana.gpg"
-  tags:
-    - role::alloy
-
-- name: Add Grafana apt repository to apt lists
-  ansible.builtin.apt_repository:
-    repo: "deb [signed-by=/etc/apt/keyrings/grafana.gpg] {{ alloy_grafana_repository }}"
-    filename: grafana
+- name: Add Grafana apt repository with key
+  deb822_repository:
+    name: grafana
+    types: deb
+    uris: "{{ alloy_grafana_repository }}"
     state: present
+    suites: [stable]
+    components: [main]
+    signed_by: "{{ alloy_grafana_signing_key }}"
   tags:
     - role::alloy
 

ansible/roles/alloy/vars/main/main.yml

@@ -1,4 +1,4 @@
 ---
 alloy_loki_endpoint: "https://loki-gateway.pydis.wtf"
-alloy_loki_user: "loki-user"
+alloy_loki_user: "loki-gateway-user"
 alloy_loki_password: "{{ vault_alloy_loki_password }}"