From: Tom Hughes <tom@compton.nu>
Date: Thu, 12 Jan 2023 22:30:39 +0000 (+0000)
Subject: Install grafana keyring manually
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/a0dc9b0ca16adfa4ee1ef92c54c3a2fbf639844e

Install grafana keyring manually
---

diff --git a/cookbooks/apt/recipes/grafana.rb b/cookbooks/apt/recipes/grafana.rb
index 5738c23d4..ef6531c1f 100644
--- a/cookbooks/apt/recipes/grafana.rb
+++ b/cookbooks/apt/recipes/grafana.rb
@@ -19,9 +19,15 @@
 
 include_recipe "apt"
 
+remote_file "/etc/apt/trusted.gpg.d/grafana.asc" do
+  source "https://packages.grafana.com/gpg.key"
+  owner "root"
+  group "root"
+  mode "644"
+end
+
 apt_repository "grafana" do
   uri "https://packages.grafana.com/enterprise/deb"
   distribution "stable"
   components ["main"]
-  key "https://packages.grafana.com/gpg.key"
 end