summaryrefslogtreecommitdiff
path: root/roles/apt-repo/grafana
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2021-08-12 23:23:04 +0200
committerChristian Pointner <equinox@spreadspace.org>2021-08-12 23:23:04 +0200
commitf73c8ff53d234c8a0d855cc9bdd6e9575d3e355a (patch)
tree6205d52cb9d89a7414dbe0d1faa01e1f61822937 /roles/apt-repo/grafana
parentlinux/ipv4: disable log_martians by default (diff)
use singed-by= option for source list entries of external repos
Diffstat (limited to 'roles/apt-repo/grafana')
-rw-r--r--roles/apt-repo/grafana/tasks/main.yml10
1 files changed, 8 insertions, 2 deletions
diff --git a/roles/apt-repo/grafana/tasks/main.yml b/roles/apt-repo/grafana/tasks/main.yml
index c7ab2c58..bf54554d 100644
--- a/roles/apt-repo/grafana/tasks/main.yml
+++ b/roles/apt-repo/grafana/tasks/main.yml
@@ -2,13 +2,19 @@
- name: add repository key
copy:
src: repo.gpg
- dest: /etc/apt/trusted.gpg.d/grafana.gpg
+ dest: /etc/apt/keyrings/grafana.gpg
register: apt_repo_grafana_key
+## TODO: remove once all servers have been converted
+- name: remove repository key from old location
+ file:
+ path: /etc/apt/trusted.gpg.d/grafana.gpg
+ state: absent
+
- name: add repository entry
copy:
content: |
- deb https://packages.grafana.com/oss/deb stable main
+ deb [signed-by=/etc/apt/keyrings/grafana.gpg] https://packages.grafana.com/oss/deb stable main
dest: /etc/apt/sources.list.d/grafana.list
register: apt_repo_grafana_sources