diff options
| author |  Joe Banks <[email protected]> | 2024-06-07 18:19:51 +0100 |
|---|---|---|
| committer | Joe Banks <[email protected]> | 2024-06-07 18:19:51 +0100 |
| commit | 61e604d09b663834cd1781492bb4351e57a60aa2 (patch) | |
| tree | 4e535c4bddadc8e87765503165ff9a1b5746706d | |
| parent | Add systemd overrides with new security preferences (diff) | |
Update Grafana repository to use explicit keyring
| -rw-r--r-- | ansible/roles/alloy/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/alloy/tasks/main.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ansible/roles/alloy/defaults/main.yml b/ansible/roles/alloy/defaults/main.yml index d52165c..928b857 100644 --- 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 index 1ad95e2..db94a77 100644 --- 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: |