From 4b4b6dd7f160e237b96989191521506ebe4fd9e6 Mon Sep 17 00:00:00 2001
From: VC <veretcle+framagit@mateu.be>
Date: Fri, 5 Jul 2024 11:53:31 +0200
Subject: [PATCH] fix: re-download/re-apply gpg key each time

---
 roles/mastodon/tasks/nodejs.yml | 5 ++---
 roles/mastodon/tasks/yarn.yml   | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/roles/mastodon/tasks/nodejs.yml b/roles/mastodon/tasks/nodejs.yml
index 4b1bbcf..6a5f331 100644
--- a/roles/mastodon/tasks/nodejs.yml
+++ b/roles/mastodon/tasks/nodejs.yml
@@ -4,11 +4,10 @@
   get_url:
     url: "{{ mastodon_nodejs_key_url }}"
     dest: /tmp/nodesource.gpg.key
+    force: true
 
 - name: gpg dearmor key
-  shell: "gpg --dearmor -o {{ mastodon_nodejs_key_path }} /tmp/nodesource.gpg.key"
-  args:
-    creates: "{{ mastodon_nodejs_key_path }}"
+  shell: "gpg --dearmor --yes -o {{ mastodon_nodejs_key_path }} /tmp/nodesource.gpg.key"
 
 - name: node source repo
   copy:
diff --git a/roles/mastodon/tasks/yarn.yml b/roles/mastodon/tasks/yarn.yml
index 244330d..a1d3d7b 100644
--- a/roles/mastodon/tasks/yarn.yml
+++ b/roles/mastodon/tasks/yarn.yml
@@ -4,11 +4,10 @@
   get_url:
     url: "{{ mastodon_yarn_key_url }}"
     dest: /tmp/yarn.gpg.key
+    force: true
 
 - name: gpg dearmor key
-  shell: "gpg --dearmor -o {{ mastodon_yarn_key_path }} /tmp/yarn.gpg.key"
-  args:
-    creates: "{{ mastodon_yarn_key_path }}"
+  shell: "gpg --dearmor --yes -o {{ mastodon_yarn_key_path }} /tmp/yarn.gpg.key"
 
 - name: yarn source repo
   copy: