Use new way of installing apt keys

mediafellows · Jul 30, 2024 · 4b3d334 · 4b3d334
1 parent 8465f25
commit 4b3d334
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/tasks/install-debian.yml b/tasks/install-debian.yml
@@ -4,14 +4,14 @@
     name: apt-transport-https
     state: present
 
-- name: Import InfluxData GPG signing key [Debian/Ubuntu]
-  ansible.builtin.apt_key:
-    url: "{{ telegraf_repo_base_url }}/influxdata-archive_compat.key"
-    state: present
+- name: Install Telegraf apt key [Debian/Ubuntu]
+  ansible.builtin.get_url:
+    url: "{{ telegraf_repo_base_url }}/influxdata-archive.key"
+    dest: "{{ telegraf_repo_apt_key_dest }}"
 
 - name: Add InfluxData repository [Debian/Ubuntu]
   ansible.builtin.apt_repository:
-    repo: deb {{ telegraf_repo_base_url }}/{{ ansible_distribution | lower }} stable main
+    repo: deb [signed-by={{ telegraf_repo_apt_key_dest }}] {{ telegraf_repo_base_url }}/{{ ansible_distribution | lower }} stable main
     state: present
 
 - name: Install Telegraf packages [Debian/Ubuntu]

diff --git a/vars/main.yml b/vars/main.yml
@@ -5,6 +5,7 @@ telegraf_install_version: stable
 
 # Telegraf repo (by Influxdata)
 telegraf_repo_base_url: "https://repos.influxdata.com"
+telegraf_repo_apt_key_dest: /etc/apt/keyrings/influxdata-archive.asc
 
 # Sane defaults for global settings
 telegraf_agent_interval: 10s