From b25fff35076fe97aeb63517dd0afe4cde8af9434 Mon Sep 17 00:00:00 2001
From: L3D <l3d@c3woc.de>
Date: Mon, 30 Oct 2023 01:59:23 +0100
Subject: [PATCH] Improve gpg key import

---
 tasks/install-debian.yml | 11 +++++------
 vars/main.yml            |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/tasks/install-debian.yml b/tasks/install-debian.yml
index 9815a53..57d6047 100644
--- a/tasks/install-debian.yml
+++ b/tasks/install-debian.yml
@@ -34,12 +34,11 @@
 
 - name: Import WeeChat GPG key
   become: true
-  ansible.builtin.get_url:
-    url: "https://keys.openpgp.org/vks/v1/by-fingerprint/{{ weechat__gpg_id }}"
-    dest: '/usr/share/keyrings/weechat-archive-keyring.gpg'
-    owner: 'root'
-    group: 'root'
-    mode: '0644'
+  ansible.builtin.apt_key:
+    keyserver: "hkps://keys.openpgp.org"
+    id: "{{ weechat__gpg_id }}"
+    keyring: '/usr/share/keyrings/weechat-archive-keyring.gpg'
+    state: 'present'
 
 - name: Add weechat repo
   become: true
diff --git a/vars/main.yml b/vars/main.yml
index dc3952c..d04ddee 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -9,7 +9,7 @@ weechat_plugin_languages:
   lua: 'lua'
 
 # version management
-playbook_version_number: 4224  # should be over ninethousand
+playbook_version_number: 4225  # should be over ninethousand
 playbook_version_path: 'role-weechat_roles-ansible_github.com.version'
 
 weechat__debian_weechat_repo: "https://weechat.org/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main"