From 8928b243b1f37bc34e463fc2485cccb9eccb8399 Mon Sep 17 00:00:00 2001
From: L3D <l3d@c3woc.de>
Date: Thu, 26 Jan 2023 04:12:00 +0100
Subject: [PATCH] solve issue with gitea gpg key and download

Change gitea gpg behaviour and change download filename
---
 tasks/install.yml | 7 ++++++-
 vars/main.yml     | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tasks/install.yml b/tasks/install.yml
index 58505aa..f3da30a 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -51,11 +51,16 @@
       changed_when: false
       failed_when: _gitea_gpg_key_status.rc not in (0, 2)
 
+    - name: print gpg key staus on verbosity
+      ansible.builtin.debug:
+        msg: "{{ _gitea_gpg_key_status.stdout }}"
+        verbosity: 1
+
     - name: Import gitea gpg key
       ansible.builtin.command: "gpg --keyserver {{ gitea_gpg_server }} --recv {{ gitea_gpg_key }}"
       register: _gitea_import_key
       changed_when: '"imported: 1" in _gitea_import_key.stderr'
-      when: _gitea_gpg_key_status.rc != 0
+      when: '_gitea_gpg_key_status.rc != 0 or "expired" in _gitea_gpg_key_status.stdout'
 
     - name: Check archive signature
       ansible.builtin.command: "gpg --verify /tmp/{{ gitea_filename }}.xz.asc /tmp/{{ gitea_filename }}.xz"
diff --git a/vars/main.yml b/vars/main.yml
index fe6297c..10d7f52 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -8,7 +8,7 @@ gitea_go_arch_map:
   armv5l: 'arm-5'
 
 gitea_arch: "{{ gitea_go_arch_map[ansible_architecture] | default(ansible_architecture) }}"
-gitea_filename: "gitea-{{ gitea_version }}.linux-{{ gitea_arch }}"
+gitea_filename: "gitea-{{ gitea_version_target }}.linux-{{ gitea_arch }}"
 
 gitea_variables:
   files:
@@ -56,5 +56,5 @@ transfer_custom_footer:
     - 'files/gitea_footer/extra_links_footer.tmpl'
     - 'files/extra_links_footer.tmpl'
 
-playbook_version_number: 40  # should be int
+playbook_version_number: 41  # should be int
 playbook_version_path: 'do1jlr.gitea.version'