From 4bf5099ab21edeff6a1848393fb3fa30ee86d94e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20M=C3=A4user?= <bma@fan-internet.de>
Date: Fri, 10 Feb 2023 11:17:50 +0100
Subject: [PATCH] Accomodate for new grafana repo location

---
 roles/grafana/tasks/main.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml
index 6168c19..be2af3a 100644
--- a/roles/grafana/tasks/main.yml
+++ b/roles/grafana/tasks/main.yml
@@ -1,10 +1,14 @@
 ---
 
-- name: Enable grafana apt-key
-  apt_key: url="https://packages.grafana.com/gpg.key"
+- name: Retrieve Grafana Key and avoid apt_key
+  block:
+    - name: grafana |no apt key
+      ansible.builtin.get_url:
+        url: https://apt.grafana.com/gpg.key
+        dest: /usr/share/keyrings/grafana.key
 
 - name: Enable grafana repository
-  apt_repository: repo="deb https://packages.grafana.com/oss/deb stable main"
+  apt_repository: repo="deb [signed-by=/usr/share/keyrings/grafana.key] https://apt.grafana.com stable main"
 
 - name: Install grafana
   apt: name=grafana